lp://qastaging/~nick-dedekind/unity-mir/unity-mir.trusted_sessions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/unity-mir at revision 241

Mir development team: Pending requested 2014-02-26

Diff: 1073 lines (+438/-123)

14 files modified

src/modules/Unity/Application/ApplicationImage.qml (+8/-0)
src/modules/Unity/Application/CMakeLists.txt (+4/-2)
src/modules/Unity/Application/application.cpp (+33/-11)
src/modules/Unity/Application/application.h (+18/-4)
src/modules/Unity/Application/application_manager.cpp (+196/-86)
src/modules/Unity/Application/application_manager.h (+11/-6)
src/modules/Unity/Application/applicationscreenshotprovider.cpp (+4/-2)
src/modules/Unity/Application/dbuswindowstack.cpp (+1/-1)
src/modules/Unity/Application/mirsurfacemanager.cpp (+13/-10)
src/modules/Unity/Application/session.cpp (+70/-0)
src/modules/Unity/Application/session.h (+60/-0)
src/unity-mir/sessionlistener.cpp (+13/-0)
src/unity-mir/sessionlistener.h (+6/-0)
src/unity-mir/shellserverconfiguration.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

175. By Nick Dedekind on 2014-02-26

trusted session parent

174. By Nick Dedekind on 2014-02-21

Initial trusted sessions

173. By Nick Dedekind on 2014-02-18

merged with trunk

172. By PS Jenkins bot on 2014-02-04

Releasing 0.2+14.04.20140204.1-0ubuntu1

171. By kevin gunn on 2014-02-04

bump debian version for mir to 0.1.4

170. By Łukasz Zemczak on 2014-01-16

Fix the multi-arch stanza in the new -tests package.

Approved by PS Jenkins bot, Didier Roche, Colin Watson.

169. By PS Jenkins bot on 2014-01-16

Releasing 0.2+14.04.20140116-0ubuntu1 (revision 168 from lp:unity-mir).

Approved by PS Jenkins bot.

168. By Ricardo Mendoza on 2014-01-16

Correctly respect lifecycle exceptions in the new sidestage model. Fixes: https://bugs.launchpad.net/bugs/1269414.

Approved by Łukasz Zemczak, Gerry Boland, PS Jenkins bot.

167. By Gerry Boland on 2014-01-15

[cmake] set default build type to RelWithDebInfo, add workaround to set QT_NO_DEBUG with that option.

Approved by Thomas Voß, PS Jenkins bot, Andreas Pokorny.

166. By Albert Astals Cid on 2014-01-15

Tests for ApplicationManager start/stopApplication

At the moment they just work on the device (well they may as well work on Mir on the desktop but have not tried).

You need to install the libunity-mir-tests package and then run unity-mir-test-app.

Approved by Gerry Boland, PS Jenkins bot.