Merge lp:~mterry/unity-api/fix-wakelocks into lp:unity-api
Proposed by
Michael Terry
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel d'Andrada | ||||
Approved revision: | 204 | ||||
Merged at revision: | 203 | ||||
Proposed branch: | lp:~mterry/unity-api/fix-wakelocks | ||||
Merge into: | lp:unity-api | ||||
Prerequisite: | lp:~dandrader/unity-api/surfaceItemFillMode2 | ||||
Diff against target: |
164 lines (+40/-1) 7 files modified
debian/changelog (+4/-0) include/unity/shell/application/ApplicationInfoInterface.h (+10/-0) include/unity/shell/application/ApplicationManagerInterface.h (+2/-0) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp (+16/-1) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+3/-0) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp (+2/-0) test/qmltest/unity/shell/application/tst_Application.qml (+3/-0) |
||||
To merge this branch: | bzr merge lp:~mterry/unity-api/fix-wakelocks | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+279499@code.launchpad.net |
This proposal supersedes a proposal from 2015-12-03.
Commit message
Added ApplicationInfo
Description of the change
Added ApplicationInfo
Related to similar changes in qtmir and unity8, to fix bug 1518764:
https:/
https:/
To post a comment you must log in.
PASSED: Continuous integration, rev:202 jenkins. qa.ubuntu. com/job/ unity-api- ci/369/ jenkins. qa.ubuntu. com/job/ unity-api- vivid-amd64- ci/57 jenkins. qa.ubuntu. com/job/ unity-api- vivid-armhf- ci/58 jenkins. qa.ubuntu. com/job/ unity-api- vivid-armhf- ci/58/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-api- vivid-i386- ci/57 jenkins. qa.ubuntu. com/job/ unity-api- wily-amd64- ci/68 jenkins. qa.ubuntu. com/job/ unity-api- wily-armhf- ci/68 jenkins. qa.ubuntu. com/job/ unity-api- wily-armhf- ci/68/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-api- wily-i386- ci/68
http://
Executed test runs:
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/unity- api-ci/ 369/rebuild
http://