Merge lp:~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds into lp:ubuntu-ui-toolkit/staging
Proposed by
Benjamin Zeller
Status: | Needs review |
---|---|
Proposed branch: | lp:~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
47 lines (+9/-12) 3 files modified
apicheck/apicheck.pro (+2/-4) src/Ubuntu/UbuntuToolkit/menubar.cpp (+5/-5) ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro (+2/-3) |
To merge this branch: | bzr merge lp:~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
Zoltan Balogh | Pending | ||
Review via email: mp+304851@code.launchpad.net |
This proposal supersedes a proposal from 2016-09-03.
Commit message
- Some out of source build fixes
- Implicit casting of QPointer<QObject> to QObject* does not work on trusty
Description of the change
- Some out of source build fixes
- Implicit casting of QPointer<QObject> to QObject* does not work on trusty
To post a comment you must log in.
Unmerged revisions
- 2090. By Benjamin Zeller
-
Implicit casting of QPointer<QObject> to QObject* does not work on trusty
- 2089. By Benjamin Zeller
-
Fix out of source builds
FAILED: Continuous integration, rev:2090 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1135/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/5772/ 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/1135/ rebuild
https:/