lp:~gerboland/unity-api/appManVersion2

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:unity-api

Michael Zanetti (community): Approve on 2014-06-26

PS Jenkins bot (community): Approve (continuous-integration) on 2014-06-25

Diff: 527 lines (+187/-103)

9 files modified

debian/changelog (+6/-0)
include/unity/shell/application/ApplicationInfoInterface.h (+29/-6)
include/unity/shell/application/ApplicationManagerInterface.h (+31/-40)
include/unity/shell/application/CMakeLists.txt (+1/-1)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp (+7/-1)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+15/-13)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp (+14/-16)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h (+19/-23)
test/qmltest/unity/shell/application/tst_Application.qml (+65/-3)

api

Superseded for merging into lp:~unity-team/unity-api/qtMirCompositor

Michael Zanetti (community): Needs Fixing on 2014-05-13

Diff: 560 lines (+174/-135)

9 files modified

debian/changelog (+6/-0)
include/unity/shell/application/ApplicationInfoInterface.h (+28/-14)
include/unity/shell/application/ApplicationManagerInterface.h (+25/-50)
include/unity/shell/application/CMakeLists.txt (+1/-1)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp (+7/-6)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+14/-14)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp (+9/-19)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h (+19/-24)
test/qmltest/unity/shell/application/tst_Application.qml (+65/-7)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Related blueprints

151. By Gerry Boland on 2014-06-24

debian: package version 7.90

150. By Gerry Boland on 2014-06-23

Merge trunk

149. By Gerry Boland on 2014-06-19

changelog correction

148. By Gerry Boland on 2014-06-19

Update changelog

147. By Gerry Boland on 2014-06-19

Merge trunk

146. By Gerry Boland on 2014-05-20

Restore the Application screenshot API for now

145. By Gerry Boland on 2014-05-13

Resolve conflict

144. By Gerry Boland on 2014-05-13

Bump debian version

143. By Gerry Boland on 2014-05-13

Add test for flags operator |

142. By Gerry Boland on 2014-05-13

Add tests to verify state & stage enums