Merge lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-qt-submodule-build-fix into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Loïc Molinari
Status: | Merged |
---|---|
Approved by: | Benjamin Zeller |
Approved revision: | 2089 |
Merged at revision: | 2094 |
Proposed branch: | lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-qt-submodule-build-fix |
Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
Diff against target: |
51 lines (+10/-12) 3 files modified
.qmake.conf (+8/-6) features/ubuntu_qt_module.prf (+2/-4) src/Ubuntu/UbuntuToolkit/menu.cpp (+0/-2) |
To merge this branch: | bzr merge lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-qt-submodule-build-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Benjamin Zeller | Approve | ||
Zoltan Balogh | Approve | ||
Review via email:
|
Commit message
Fixed the build as a Qt submodule.
Description of the change
Fixed the build as a Qt submodule.
To post a comment you must log in.
FAILED: Continuous integration, rev:2089 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1132/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/5756/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1132/ rebuild
https:/