Merge lp://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds into lp://qastaging/ubuntu-ui-toolkit/staging

Proposed by Benjamin Zeller
Status: Needs review
Proposed branch: lp://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds
Merge into: lp://qastaging/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://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Needs Fixing
Zoltan Balogh Pending
Review via email: mp+304851@code.qastaging.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.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches