Merge lp:~nick-dedekind/unity8/move-indicator-qml into lp:unity8
Proposed by
Nick Dedekind
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 980 |
Merged at revision: | 1002 |
Proposed branch: | lp:~nick-dedekind/unity8/move-indicator-qml |
Merge into: | lp:unity8 |
Diff against target: |
272 lines (+14/-99) 13 files modified
plugins/Unity/Indicators/CMakeLists.txt (+1/-4) plugins/Unity/Indicators/qmldir (+0/-4) qml/Panel/Indicators/DefaultIndicatorPage.qml (+2/-2) qml/Panel/Indicators/DefaultIndicatorWidget.qml (+1/-2) qml/Panel/Indicators/IndicatorBase.qml (+2/-3) qml/Panel/Indicators/IndicatorDelegate.qml (+1/-2) tests/mocks/Unity/Indicators/IndicatorBase.qml (+0/-38) tests/mocks/Unity/Indicators/MenuItemFactory.qml (+0/-38) tests/mocks/Unity/Indicators/qmldir (+0/-2) tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml (+1/-0) tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml (+1/-0) tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml (+3/-2) tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml (+2/-2) |
To merge this branch: | bzr merge lp:~nick-dedekind/unity8/move-indicator-qml |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Michał Sawicz | Approve | ||
Review via email: mp+223947@code.launchpad.net |
Commit message
Moved [Message]
Description of the change
Moved [Message]
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
To post a comment you must log in.
FAILED: Continuous integration, rev:978 jenkins. qa.ubuntu. com/job/ unity8- ci/3186/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/1072 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 190 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 280 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 280 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 280/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 280 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/1441 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1875 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1875/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 8678
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/3186/ rebuild
http://