lp:~alan-griffiths/qtmir/MirServer-is-not-a-context-object

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qtmir at revision 492

Daniel d'Andrada (community): Approve on 2016-05-06

Unity8 CI Bot (community): Approve (continuous-integration) on 2016-05-06

Alan Griffiths: Abstain on 2016-05-06

Diff: 539 lines (+59/-71)

20 files modified

src/modules/Unity/Application/application.cpp (+0/-5)
src/modules/Unity/Application/application_manager.cpp (+4/-11)
src/modules/Unity/Application/application_manager.h (+0/-5)
src/modules/Unity/Application/mirsurface.cpp (+1/-0)
src/modules/Unity/Application/mirsurface.h (+5/-2)
src/modules/Unity/Application/mirsurfacemanager.cpp (+8/-7)
src/modules/Unity/Application/mirsurfacemanager.h (+2/-5)
src/platforms/mirserver/miropenglcontext.cpp (+8/-8)
src/platforms/mirserver/miropenglcontext.h (+6/-4)
src/platforms/mirserver/mirserver.cpp (+2/-2)
src/platforms/mirserver/mirserver.h (+2/-8)
src/platforms/mirserver/mirserverintegration.cpp (+3/-1)
src/platforms/mirserver/nativeinterface.cpp (+7/-1)
src/platforms/mirserver/nativeinterface.h (+3/-2)
src/platforms/mirserver/offscreensurface.cpp (+0/-2)
src/platforms/mirserver/qmirserver_p.cpp (+4/-1)
src/platforms/mirserver/qmirserver_p.h (+1/-2)
src/platforms/mirserver/surfaceobserver.h (+0/-1)
tests/framework/qtmir_test.cpp (+2/-3)
tests/framework/qtmir_test.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

495. By Alan Griffiths on 2016-05-06

In qtmir we write "Foo &foo", not "Foo& foo"

494. By Alan Griffiths on 2016-05-06

MirShell is misleading, get rid of it instead of copying it

493. By Alan Griffiths on 2016-05-06

It's traditional in Qt APIs to have the parent parameter be optional

492. By Alan Griffiths on 2016-05-05

Revert unintended change to layout

491. By Alan Griffiths on 2016-05-05

offscreensurface.cpp doesn't need mirserver.h

490. By Alan Griffiths on 2016-05-05

qmirserver_p.h doesn't need mirserver.h

489. By Alan Griffiths on 2016-05-05

ApplicationManager doesn't need MirServer

488. By Alan Griffiths on 2016-05-05

MirSurfaceManager doesn't need MirServer

487. By Alan Griffiths on 2016-05-05

MirOpenGLContext shouldn't need MirServer

486. By Alan Griffiths on 2016-05-05

Remove unused variable