lp:~dandrader/qtmir/miral-qt-integration

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~unity-team/qtmir/miral-qt-integration at revision 589

Gerry Boland (community): Approve on 2016-12-13

Diff: 230 lines (+43/-41)

11 files modified

CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
debian/control (+5/-5)
src/platforms/mirserver/miropenglcontext.cpp (+3/-12)
src/platforms/mirserver/mirserverstatuslistener.cpp (+8/-0)
src/platforms/mirserver/mirserverstatuslistener.h (+2/-5)
tests/framework/fake_displayconfigurationoutput.h (+3/-10)
tests/framework/fake_surface.h (+6/-3)
tests/framework/mock_mir_session.cpp (+2/-0)
tests/framework/mock_mir_session.h (+3/-0)
tests/framework/mock_surface.h (+3/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

589. By Daniel d'Andrada on 2016-12-13

Bump dependency version of other mir packages

588. By Daniel d'Andrada on 2016-12-13

Mir 0.25 compat (merging upcoming trunk)

587. By Daniel d'Andrada on 2016-12-07

findApplicationWithSurface is const

586. By Daniel d'Andrada on 2016-12-05

Add missing license header

585. By Daniel d'Andrada on 2016-12-01

Fix order of entries in debian/changelog

584. By Daniel d'Andrada on 2016-12-01

Merge trunk

[ Albert Astals Cid ]
* Build with Qt 5.7 (LP: #1642608, #1642954)
[ Gerry Boland ]
* Fix FTBFS due to new googletest framework release (1.8)
* Revert Lttng test-crash workaround from rev 557
[ Jonas G. Drange ]
* relax auth of clients to allow USS to set base mir display config

583. By Daniel d'Andrada on 2016-11-25

MirSurface: Improve logging and don't use miral::Window of a dead surface

+ Update mirSurfaceTypeToStr

582. By Daniel d'Andrada on 2016-11-24

MirSurface::activate()

Let shell decide whether to activate a surface when a client
requests a surface to be raised

581. By Daniel d'Andrada on 2016-11-17

Move TopLevelWindowModel out of qtmir. Export a SurfaceManager instead

580. By Gerry Boland on 2016-11-16

Fix handling of command line arguments