lp://staging/~alan-griffiths/qtmir/port-to-msh-Shell

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/qtmir at revision 315

Gerry Boland (community): Approve on 2015-02-06

Daniel d'Andrada (community): Abstain on 2015-02-05

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-02-04

Alberto Aguirre (community): Approve on 2015-02-04

Diff: 901 lines (+185/-315)

26 files modified

debian/control (+1/-1)
src/modules/Unity/Application/mirsurfaceitem.cpp (+7/-4)
src/modules/Unity/Application/mirsurfaceitem.h (+3/-0)
src/modules/Unity/Application/mirsurfacemanager.cpp (+9/-7)
src/modules/Unity/Application/mirsurfacemanager.h (+3/-0)
src/modules/Unity/Application/plugin.cpp (+1/-0)
src/modules/Unity/Application/sessionmanager.cpp (+1/-1)
src/platforms/mirserver/CMakeLists.txt (+1/-3)
src/platforms/mirserver/focussetter.cpp (+0/-24)
src/platforms/mirserver/focussetter.h (+0/-28)
src/platforms/mirserver/mirplacementstrategy.cpp (+0/-59)
src/platforms/mirserver/mirplacementstrategy.h (+0/-42)
src/platforms/mirserver/mirserver.cpp (+13/-20)
src/platforms/mirserver/mirserver.h (+4/-3)
src/platforms/mirserver/mirshell.cpp (+75/-0)
src/platforms/mirserver/mirshell.h (+56/-0)
src/platforms/mirserver/nativeinterface.cpp (+2/-2)
src/platforms/mirserver/qteventfeeder.cpp (+2/-2)
src/platforms/mirserver/qteventfeeder.h (+2/-2)
src/platforms/mirserver/surfaceconfigurator.cpp (+0/-34)
src/platforms/mirserver/surfaceconfigurator.h (+0/-41)
tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp (+1/-1)
tests/modules/common/mock_focus_controller.h (+0/-40)
tests/modules/common/mock_mir_session.h (+1/-0)
tests/modules/common/mock_surface.h (+1/-0)
tests/modules/common/qtmir_test.h (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

319. By Alan Griffiths on 2015-02-06

Route surface config changes through shell->set_surface_attribute()

318. By Alan Griffiths on 2015-02-05

update based on dandrader's feedback

317. By Alan Griffiths on 2015-02-04

Apply Qt coding style to identifiers

316. By Alan Griffiths on 2015-02-04

Bump libmirserver-dev dependency

315. By Alan Griffiths on 2015-02-02

Update debug message after cut&paste

314. By Alan Griffiths on 2015-02-02

Use AbstractShell to simplify implementation

313. By Alan Griffiths on 2015-02-02

Compatibility with nsecs_t removal

312. By Alan Griffiths on 2015-01-28

Clean up comments etc

311. By Alan Griffiths on 2015-01-28

First pass at msh-Shell compatability

310. By Alan Griffiths on 2015-01-22

Delete dead code