lp:~mir-team/qtmir/compatibility-with-mir-API-changes

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:qtmir

Gerry Boland (community): Needs Fixing (code) on 2015-03-31

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-03-25

Diff: 259 lines (+49/-20)

13 files modified

CMakeLists.txt (+2/-1)
debian/control (+2/-2)
src/modules/Unity/Application/CMakeLists.txt (+0/-1)
src/modules/Unity/Application/application_manager.cpp (+7/-4)
src/platforms/mirserver/CMakeLists.txt (+1/-1)
src/platforms/mirserver/displaywindow.cpp (+16/-2)
src/platforms/mirserver/displaywindow.h (+3/-1)
src/platforms/mirserver/mirserver.h (+0/-1)
src/platforms/mirserver/mirserverintegration.cpp (+11/-4)
src/platforms/mirserver/mirshell.cpp (+3/-1)
src/platforms/mirserver/surfaceobserver.h (+1/-0)
tests/modules/common/mock_surface.h (+2/-1)
tests/modules/common/stub_scene_surface.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

282. By Alan Griffiths on 2015-04-01

merge lp:~mir-team/qtmir/devel-mir-next-update/

281. By Alan Griffiths on 2015-04-01

merge lp:~alan-griffiths/qtmir/spike-using-WindowManager

280. By Alan Griffiths on 2015-04-01

Use current event API

279. By Alan Griffiths on 2015-04-01

layout fixes

278. By Alan Griffiths on 2015-04-01

merge lp:~mir-team/qtmir/compatibility-with-mir-API-changes

277. By Daniel van Vugt on 2015-03-27

Update mock headers so they can build again, following racarr's
cursor BufferStream changes.

276. By Daniel van Vugt on 2015-03-27

Migrate to MirEvent 2.1 API, coming in Mir 0.13

275. By Daniel van Vugt on 2015-03-25

Link to libmirclient too. That's where all mir_* client (and input
functions) now correctly reside.

274. By Daniel van Vugt on 2015-03-25

Merge branch lp:~mir-team/qtmir/compatibility-with-mir-API-changes

273. By Daniel van Vugt on 2015-03-25

Merge latest trunk. Now identical.