Merge lp:~laney/ubuntu-system-settings/background-toggle into lp:ubuntu-system-settings
Proposed by
Iain Lane
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 731 |
Merged at revision: | 727 |
Proposed branch: | lp:~laney/ubuntu-system-settings/background-toggle |
Merge into: | lp:ubuntu-system-settings |
Prerequisite: | lp:~mterry/ubuntu-system-settings/split-bg |
Diff against target: |
50 lines (+16/-18) 1 file modified
plugins/background/MainPage.qml (+16/-18) |
To merge this branch: | bzr merge lp:~laney/ubuntu-system-settings/background-toggle |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+222298@code.launchpad.net |
This proposal supersedes a proposal from 2014-06-06.
Commit message
Inline setUpImages(), otherwise the function call doesn't do anything.
Description of the change
Inline setUpImages(), otherwise the function call doesn't do anything.
No, I don't know why this helps. QML :(
To post a comment you must log in.
FAILED: Continuous integration, rev:731 /code.launchpad .net/~laney/ ubuntu- system- settings/ background- toggle/ +merge/ 222298/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/864/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/716 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 662 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- amd64-ci/ 56 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- armhf-ci/ 56 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- armhf-ci/ 56/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 56 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/1142 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1353 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1353/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 8165 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 589 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/801 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/801/ artifact/ work/output/ *zip*/output. zip
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/864/ rebuild
http://