lp://staging/~alan-griffiths/qtmir/migrate-to-mir-Server-API

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/qtmir

Gerry Boland (community): Approve on 2014-11-14

Diff: 1018 lines (+172/-222)

21 files modified

src/modules/Unity/Application/application_manager.cpp (+8/-8)
src/modules/Unity/Application/application_manager.h (+3/-3)
src/modules/Unity/Application/mirsurfacemanager.cpp (+4/-4)
src/modules/Unity/Application/mirsurfacemanager.h (+3/-3)
src/modules/Unity/Application/sessionmanager.cpp (+6/-6)
src/modules/Unity/Application/sessionmanager.h (+3/-3)
src/platforms/mirserver/display.cpp (+5/-4)
src/platforms/mirserver/display.h (+3/-4)
src/platforms/mirserver/miropenglcontext.cpp (+6/-6)
src/platforms/mirserver/miropenglcontext.h (+3/-3)
src/platforms/mirserver/mirserver.cpp (+53/-102)
src/platforms/mirserver/mirserver.h (+21/-17)
src/platforms/mirserver/mirserver.pro (+2/-2)
src/platforms/mirserver/mirserverintegration.cpp (+14/-19)
src/platforms/mirserver/mirserverintegration.h (+3/-3)
src/platforms/mirserver/nativeinterface.cpp (+6/-6)
src/platforms/mirserver/nativeinterface.h (+3/-3)
src/platforms/mirserver/qmirserver.cpp (+1/-1)
src/platforms/mirserver/qmirserver.h (+10/-10)
tests/modules/common/qtmir_test.h (+11/-15)
tests/tests.pro (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

286. By Alan Griffiths on 2014-11-28

merge lp:qtmir

285. By Alan Griffiths on 2014-11-06

Fix outdated names

284. By Alan Griffiths on 2014-11-06

Ensure MirServer is initialized by calling apply_settings() in ctor

283. By Alan Griffiths on 2014-11-03

Rename MirServerConfiguration => MirServer

282. By Alan Griffiths on 2014-11-03

Clean up after spike

281. By Alan Griffiths on 2014-11-03

Fix up the tests

280. By Alan Griffiths on 2014-10-31

Remove mentions of mir::DefaultServerConfiguration

279. By Alan Griffiths on 2014-10-31

Quick spike to test API

278. By PS Jenkins bot on 2014-10-30

Releasing 0.4.4+15.04.20141030.2-0ubuntu1

277. By Timo Jyrinki on 2014-10-30

Add libmtdev-dev build dependency (LP: #1379152) Fixes: 1379152
Approved by: Gerry Boland, PS Jenkins bot