Ubuntu SDK IDE

Merge lp:~zeller-benjamin/ubuntu-sdk-ide/uitk-from-staging into lp:ubuntu-sdk-ide

  1. uitk-from-staging
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 148
Merged at revision: 146
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/uitk-from-staging
Merge into: lp:ubuntu-sdk-ide
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/uitk-from-staging
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+304522@code.launchpad.net

Commit message

Switch to ui-toolkit staging

Description of the change

Switch to ui-toolkit staging

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:148
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/54/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5747/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/54/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:148
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/55/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5748/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/55/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-08-29 16:13:51 +0000
3+++ CMakeLists.txt 2016-08-31 15:18:48 +0000
4@@ -37,7 +37,7 @@
5 add_custom_target(QtSource
6 ${CMAKE_SOURCE_DIR}/get_bzr_source.py -d "${QT_SOURCE_DIR}" lp:~bzoltan/+junk/qt-everywhere-opensource-src-5.6.0
7 COMMAND ${CMAKE_SOURCE_DIR}/get_package_source.py -c ${QT_SOURCE_DIR} qtfeedback-opensource-src:qtfeedback qtpim-opensource-src:qtpim
8- COMMAND ${CMAKE_SOURCE_DIR}/get_bzr_source.py -d ${QT_SOURCE_DIR}/ubuntu-sdk lp:~zeller-benjamin/ubuntu-ui-toolkit/qt56-2
9+ COMMAND ${CMAKE_SOURCE_DIR}/get_bzr_source.py -d ${QT_SOURCE_DIR}/ubuntu-sdk lp:ubuntu-ui-toolkit/staging
10 COMMAND cat ${CMAKE_SOURCE_DIR}/patches/qt-enable-uitk.patch >> ${QT_SOURCE_DIR}/.gitmodules
11 COMMAND ${CMAKE_SOURCE_DIR}/fix-qt-build.py -b \"${QT_SOURCE_DIR}\"
12 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})

Subscribers

People subscribed via source and target branches