lp:~alan-griffiths/miral/encapsulate-mir-PromptSession

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:miral at revision 400

Gerry Boland (community): Approve on 2016-10-10

Diff: 558 lines (+131/-69)

16 files modified

miral-qt/src/common/mirqtconversion.h (+1/-1)
miral-qt/src/modules/Unity/Application/application.h (+0/-6)
miral-qt/src/modules/Unity/Application/session.cpp (+14/-14)
miral-qt/src/modules/Unity/Application/session.h (+5/-5)
miral-qt/src/modules/Unity/Application/session_interface.h (+5/-5)
miral-qt/src/modules/Unity/Application/sessionmanager.cpp (+3/-2)
miral-qt/src/modules/Unity/Application/sessionmanager.h (+2/-2)
miral-qt/src/platforms/mirserver/CMakeLists.txt (+1/-1)
miral-qt/src/platforms/mirserver/promptsession.h (+62/-0)
miral-qt/src/platforms/mirserver/promptsessionmanager.cpp (+6/-6)
miral-qt/src/platforms/mirserver/promptsessionmanager.h (+6/-6)
miral-qt/tests/framework/fake_session.cpp (+7/-5)
miral-qt/tests/framework/fake_session.h (+4/-4)
miral-qt/tests/framework/mock_session.h (+5/-4)
miral-qt/tests/modules/SessionManager/session_manager_test.cpp (+5/-4)
miral-qt/tests/modules/SessionManager/session_test.cpp (+5/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

401. By Alan Griffiths on 2016-10-10

Adopt local fashion

400. By Alan Griffiths on 2016-10-10

Adopt local fashion

399. By Alan Griffiths on 2016-10-07

merge :parent

398. By Alan Griffiths on 2016-10-07

Adopt local fashion

397. By Alan Griffiths on 2016-10-06

Mostly encapsulate mir::scene::PromptSession

396. By Alan Griffiths on 2016-10-06

Delete dead stuff

395. By Daniel d'Andrada on 2016-10-06

[miral-qt] Remove dead code: MirSurface::updateWindowInfo

Not called anywhere

394. By Alan Griffiths on 2016-10-06

A convenient overload of WindowManagerTools::modify_window() that doesn't require the WindowInfo

393. By Alan Griffiths on 2016-10-05

Introduce qtmir::PromptSessionManager to encapsulate the Mir type

392. By Alan Griffiths on 2016-10-05

[miral-qt] Remove unused CreationHints