Merge lp://qastaging/~pete-woods/unity-action-api/automatic-quit-action into lp://qastaging/unity-action-api
Proposed by
Pete Woods
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Antti Kaijanmäki | ||||
Approved revision: | 40 | ||||
Merged at revision: | 32 | ||||
Proposed branch: | lp://qastaging/~pete-woods/unity-action-api/automatic-quit-action | ||||
Merge into: | lp://qastaging/unity-action-api | ||||
Diff against target: |
484 lines (+217/-24) 9 files modified
CMakeLists.txt (+5/-0) debian/changelog (+7/-0) include/unity/action/unity-action-manager.h (+2/-0) qml/Ubuntu/Unity/Action/plugin.cpp (+7/-1) src/CMakeLists.txt (+1/-1) src/unity-action-manager.cpp (+59/-7) test/cpp/tst_actionmanager.cpp (+14/-14) test/qml/CMakeLists.txt (+14/-1) test/qml/tst_api1.1.qml (+108/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~pete-woods/unity-action-api/automatic-quit-action | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Antti Kaijanmäki (community) | Approve | ||
Review via email:
|
Commit message
Add automatic quit action to HUD toolbar
Description of the change
Add automatic quit action to HUD toolbar
To post a comment you must log in.
FAILED: Continuous integration, rev:34 jenkins. qa.ubuntu. com/job/ unity-action- api-ci/ 46/ jenkins. qa.ubuntu. com/job/ unity-action- api-trusty- amd64-ci/ 2/console jenkins. qa.ubuntu. com/job/ unity-action- api-trusty- armhf-ci/ 2/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- action- api-ci/ 46/rebuild
http://