Merge lp:~timo-jyrinki/ubuntu-system-settings/add_missing_include_qt54 into lp:ubuntu-system-settings
Proposed by
Timo Jyrinki
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sebastien Bacher | ||||
Approved revision: | 1303 | ||||
Merged at revision: | 1312 | ||||
Proposed branch: | lp:~timo-jyrinki/ubuntu-system-settings/add_missing_include_qt54 | ||||
Merge into: | lp:ubuntu-system-settings | ||||
Diff against target: |
11 lines (+1/-0) 1 file modified
plugins/about/storageabout.cpp (+1/-0) |
||||
To merge this branch: | bzr merge lp:~timo-jyrinki/ubuntu-system-settings/add_missing_include_qt54 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+249623@code.launchpad.net |
Commit message
Add a missing include to QSharedPointer needed to build with Qt 5.4. (LP: #1421607)
To post a comment you must log in.
FAILED: Continuous integration, rev:1303 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1971/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1355 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- vivid-i386- ci/241 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1195 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1353 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1353/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18053
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1971/ rebuild
http://