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

Branch merges

Propose for merging

On hold for merging into lp:qtmir/devel-mir-next

Mir development team: Pending requested 2015-04-01

PS Jenkins bot: Pending (continuous-integration) requested 2015-04-01

Diff: 777 lines (+201/-238)

14 files modified

src/modules/Unity/Application/application_manager.h (+1/-1)
src/modules/Unity/Application/mirsurfaceitem.cpp (+2/-2)
src/modules/Unity/Application/mirsurfaceitem.h (+4/-3)
src/modules/Unity/Application/mirsurfacemanager.cpp (+8/-9)
src/modules/Unity/Application/mirsurfacemanager.h (+5/-5)
src/modules/Unity/Application/sessionmanager.cpp (+0/-1)
src/platforms/mirserver/CMakeLists.txt (+1/-1)
src/platforms/mirserver/mirserver.cpp (+32/-50)
src/platforms/mirserver/mirserver.h (+8/-7)
src/platforms/mirserver/mirwindowmanager.cpp (+98/-140)
src/platforms/mirserver/mirwindowmanager.h (+33/-14)
src/platforms/mirserver/nativeinterface.cpp (+7/-2)
src/platforms/mirserver/nativeinterface.h (+1/-1)
tests/modules/common/qtmir_test.h (+1/-2)

api

Superseded for merging into lp:qtmir

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

Mir development team: Pending requested 2015-03-26

Diff: 1248 lines (+288/-271)

23 files modified

src/common/debughelpers.cpp (+4/-4)
src/modules/Unity/Application/application_manager.cpp (+2/-2)
src/modules/Unity/Application/application_manager.h (+1/-1)
src/modules/Unity/Application/mirsurfaceitem.cpp (+25/-25)
src/modules/Unity/Application/mirsurfaceitem.h (+4/-3)
src/modules/Unity/Application/mirsurfacemanager.cpp (+8/-9)
src/modules/Unity/Application/mirsurfacemanager.h (+5/-5)
src/modules/Unity/Application/sessionmanager.cpp (+0/-1)
src/platforms/mirserver/CMakeLists.txt (+1/-1)
src/platforms/mirserver/mirserver.cpp (+32/-50)
src/platforms/mirserver/mirserver.h (+8/-7)
src/platforms/mirserver/mirserverintegration.cpp (+8/-4)
src/platforms/mirserver/mirwindowmanager.cpp (+69/-36)
src/platforms/mirserver/mirwindowmanager.h (+31/-14)
src/platforms/mirserver/nativeinterface.cpp (+7/-2)
src/platforms/mirserver/nativeinterface.h (+1/-1)
src/platforms/mirserver/qteventfeeder.cpp (+33/-33)
src/platforms/mirserver/surfaceobserver.h (+2/-1)
tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+20/-52)
tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp (+17/-17)
tests/modules/common/mock_mir_session.h (+4/-0)
tests/modules/common/mock_surface.h (+5/-1)
tests/modules/common/qtmir_test.h (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

283. By Alan Griffiths on 2015-05-06

Very basic version of MirWindowManager::modify_surface()

282. By Alan Griffiths on 2015-05-06

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

281. By Alan Griffiths on 2015-05-01

libmircommon-dev dependency should be versioned

280. By Alan Griffiths on 2015-05-01

Workaround API that uses references to opaque types

279. By Alan Griffiths on 2015-05-01

Mir 0.13.0 fixes

278. By Daniel van Vugt on 2015-04-02

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

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