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

Branch merges

Propose for merging

1 branch dependent on this one.

Merged into lp:qtmir/devel-mir-next at revision 278

Daniel van Vugt: Approve on 2015-04-02

Diff: 396 lines (+142/-67)

11 files modified

debian/control (+2/-2)
src/modules/Unity/Application/CMakeLists.txt (+0/-1)
src/modules/Unity/Application/application_manager.cpp (+2/-2)
src/platforms/mirserver/CMakeLists.txt (+0/-1)
src/platforms/mirserver/displaywindow.cpp (+10/-0)
src/platforms/mirserver/mirserver.h (+0/-1)
src/platforms/mirserver/mirserverintegration.cpp (+8/-4)
src/platforms/mirserver/mirshell.cpp (+95/-2)
src/platforms/mirserver/surfaceobserver.h (+2/-1)
tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+20/-52)
tests/modules/common/mock_surface.h (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

281. By Alan Griffiths on 2015-04-01

Don't rely on Mir to provide NullWindowManager

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.

272. By Daniel van Vugt on 2015-03-06

Merge latest trunk