lp:~gerboland/miral/qt-bump-to-qtmir-529

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:miral at revision 237

Alan Griffiths: Approve on 2016-07-26

Diff: 1275 lines (+453/-333)

29 files modified

miral-qt/CMakeLists.txt (+2/-3)
miral-qt/debian/control (+3/-2)
miral-qt/debian/gles-patches/convert-to-gles.patch (+1/-1)
miral-qt/src/modules/Unity/Application/CMakeLists.txt (+3/-1)
miral-qt/src/modules/Unity/Application/application.cpp (+1/-0)
miral-qt/src/modules/Unity/Application/application_manager.cpp (+3/-0)
miral-qt/src/modules/Unity/Application/application_manager.h (+2/-0)
miral-qt/src/modules/Unity/Application/cgmanager.cpp (+117/-0)
miral-qt/src/modules/Unity/Application/cgmanager.h (+42/-0)
miral-qt/src/modules/Unity/Application/dbusfocusinfo.cpp (+89/-0)
miral-qt/src/modules/Unity/Application/dbusfocusinfo.h (+54/-0)
miral-qt/src/modules/Unity/Application/mirsurface.cpp (+41/-0)
miral-qt/src/modules/Unity/Application/mirsurface.h (+8/-0)
miral-qt/src/modules/Unity/Application/mirsurfaceinterface.h (+6/-0)
miral-qt/src/modules/Unity/Application/mirsurfaceitem.cpp (+11/-49)
miral-qt/src/modules/Unity/Application/mirsurfaceitem.h (+1/-2)
miral-qt/src/modules/Unity/Application/plugin.cpp (+0/-10)
miral-qt/src/modules/Unity/Application/session.cpp (+17/-0)
miral-qt/src/modules/Unity/Application/session.h (+4/-0)
miral-qt/src/modules/Unity/Application/session_interface.h (+6/-0)
miral-qt/src/modules/Unity/Application/ubuntukeyboardinfo.cpp (+0/-173)
miral-qt/src/modules/Unity/Application/ubuntukeyboardinfo.h (+0/-87)
miral-qt/src/platforms/mirserver/logging.cpp (+1/-0)
miral-qt/src/platforms/mirserver/logging.h (+1/-0)
miral-qt/src/platforms/mirserver/mirwindowmanager.cpp (+9/-4)
miral-qt/src/platforms/mirserver/surfaceobserver.cpp (+20/-0)
miral-qt/src/platforms/mirserver/surfaceobserver.h (+3/-1)
miral-qt/tests/framework/fake_mirsurface.h (+4/-0)
miral-qt/tests/framework/fake_session.h (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

239. By Gerry Boland on 2016-07-26

[miral-qt] merge rev 527 of qtmir: Implement MirSurface::inputBounds and make use of mir's input region

This allows us to finally drop the UbuntuKeyboardInfo hack.

238. By Gerry Boland on 2016-07-26

[miral-qt] merge rev 523 of qtmir: Don't use root dbus path (LP: #1599145)

237. By Gerry Boland on 2016-07-26

[miral-qt] merge rev 521 of qtmir: com.canonical.Unity.FocusInfo D-Bus service for providing focus information

236. By Alan Griffiths on 2016-07-26

BasicWindowManager::validate_modification_request() to sanity check before invoking policy

235. By Alan Griffiths on 2016-07-26

Move titlebar logic from BasicWindowManager to TitlebarWindoManagerPolicy and inherit CanonicalWindowManagerPolicy logic into KioskWindowManagerPolicy

234. By Alan Griffiths on 2016-07-25

The event handling logic is hardly "canonical", so move it out of CanonicalWindowManagerPolicy

233. By Gerry Boland on 2016-07-25

Qt: remove any old window management state setting code from MirSurface and friends

232. By Gerry Boland on 2016-07-25

Make qml-demo-shell more standalone, no messing with env vars

231. By Alan Griffiths on 2016-07-25

Script to initialize test environment with Xmir

230. By Alan Griffiths on 2016-07-22

Introducing ActiveOutputsMonitor to track the active outputs