lp:~gerboland/qtmir/qmirserver-hides-mirserver

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qtmir at revision 344

Daniel d'Andrada (community): Approve on 2015-05-29

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-05-27

Diff: 750 lines (+279/-192)

14 files modified

demos/qml-demo-shell/qml-demo-shell.qml (+15/-0)
src/platforms/mirserver/CMakeLists.txt (+1/-0)
src/platforms/mirserver/display.cpp (+1/-6)
src/platforms/mirserver/display.h (+7/-9)
src/platforms/mirserver/miropenglcontext.cpp (+2/-3)
src/platforms/mirserver/miropenglcontext.h (+0/-1)
src/platforms/mirserver/mirserverintegration.cpp (+24/-35)
src/platforms/mirserver/mirserverintegration.h (+3/-4)
src/platforms/mirserver/nativeinterface.cpp (+13/-10)
src/platforms/mirserver/nativeinterface.h (+3/-3)
src/platforms/mirserver/qmirserver.cpp (+69/-72)
src/platforms/mirserver/qmirserver.h (+21/-49)
src/platforms/mirserver/qmirserver_p.cpp (+53/-0)
src/platforms/mirserver/qmirserver_p.h (+67/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

340. By Gerry Boland on 2015-05-27

Only pass mg::DisplayConfiguration to qtmir::Display, as that is all it needs

339. By Gerry Boland on 2015-05-19

Remove unneeded header

338. By Gerry Boland on 2015-05-19

Merge trunk

337. By Gerry Boland on 2015-05-18

Merge qtmir trunk

336. By Gerry Boland on 2015-05-18

Remove old comment, it not the case any more

335. By Gerry Boland on 2015-05-18

Unneeded return statements

334. By Gerry Boland on 2015-05-18

Clean up shutdown codepath further. run/stop return void

333. By Gerry Boland on 2015-05-18

Fix shutdown issues by inheriting QThread directly - also get to avoid having qt event loop for mir

332. By Gerry Boland on 2015-05-18

Trying to fix shutdown, incomplete

331. By Gerry Boland on 2015-05-01

Update copyright years and added couple of minor comments