lp://qastaging/~gerboland/qtubuntu/upstream-closer

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/qtubuntu at revision 367

Daniel d'Andrada (community): Approve on 2017-01-25

Unity8 CI Bot: Approve (continuous-integration) on 2017-01-24

Diff: 4706 lines (+1834/-1069)

34 files modified

README (+7/-7)
src/ubuntumirclient/qmirclientappstatecontroller.cpp (+46/-22)
src/ubuntumirclient/qmirclientappstatecontroller.h (+45/-21)
src/ubuntumirclient/qmirclientbackingstore.cpp (+52/-30)
src/ubuntumirclient/qmirclientbackingstore.h (+46/-22)
src/ubuntumirclient/qmirclientclipboard.cpp (+58/-34)
src/ubuntumirclient/qmirclientclipboard.h (+46/-22)
src/ubuntumirclient/qmirclientcursor.cpp (+52/-28)
src/ubuntumirclient/qmirclientcursor.h (+45/-21)
src/ubuntumirclient/qmirclientdebugextension.cpp (+52/-28)
src/ubuntumirclient/qmirclientdebugextension.h (+45/-21)
src/ubuntumirclient/qmirclientdesktopwindow.cpp (+44/-20)
src/ubuntumirclient/qmirclientdesktopwindow.h (+45/-21)
src/ubuntumirclient/qmirclientglcontext.cpp (+57/-33)
src/ubuntumirclient/qmirclientglcontext.h (+46/-22)
src/ubuntumirclient/qmirclientinput.cpp (+77/-52)
src/ubuntumirclient/qmirclientinput.h (+59/-36)
src/ubuntumirclient/qmirclientintegration.cpp (+97/-74)
src/ubuntumirclient/qmirclientintegration.h (+63/-39)
src/ubuntumirclient/qmirclientlogging.h (+49/-25)
src/ubuntumirclient/qmirclientnativeinterface.cpp (+78/-54)
src/ubuntumirclient/qmirclientnativeinterface.h (+48/-24)
src/ubuntumirclient/qmirclientorientationchangeevent_p.h (+44/-20)
src/ubuntumirclient/qmirclientplatformservices.cpp (+52/-28)
src/ubuntumirclient/qmirclientplatformservices.h (+44/-20)
src/ubuntumirclient/qmirclientplugin.cpp (+50/-29)
src/ubuntumirclient/qmirclientplugin.h (+46/-21)
src/ubuntumirclient/qmirclientscreen.cpp (+56/-32)
src/ubuntumirclient/qmirclientscreen.h (+50/-26)
src/ubuntumirclient/qmirclientscreenobserver.cpp (+59/-35)
src/ubuntumirclient/qmirclientscreenobserver.h (+56/-32)
src/ubuntumirclient/qmirclientwindow.cpp (+132/-104)
src/ubuntumirclient/qmirclientwindow.h (+56/-34)
src/ubuntumirclient/ubuntumirclient.pro (+32/-32)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

365. By Gerry Boland on 2017-01-25

Undo qpa plugin name change

364. By Gerry Boland on 2017-01-24

Class renaming and syntax changes to shrink delta with upstream mirclient QPA plugin (which is equivalent to rev 360)

Changes:
- Rename classes to prefix "QMirClient" instead of "Ubuntu"
- Update licence headers to match Qt's
- change logging categories spec to match Qt: qt.qpa.mirclient
- Enforce American English
- some minor syntax tweaks

Some differences still exist:
- QPA plugin remains "ubuntumirclient" and not "mirclient" as used upstream.
- some header paths differ between in-Qt code and externally built code
- I've not included build-type switches for things like accessibility support
- relaxed switch cases to allow older versions of Mir not break a build
- panel height hack removed from upstream
- platform-api env var setting removed from upstream

363. By Nick Dedekind on 2017-02-08

merged trunk

362. By Nick Dedekind on 2016-12-09

only flush non-input events

361. By Nick Dedekind on 2016-12-09

fixed focus check regression

360. By CI Train Bot Account on 2016-12-01

Releasing 0.63+17.04.20161201.1-0ubuntu1

359. By Gerry Boland on 2016-12-01

Use debug extension only if mir-debug loaded

Fix logic error where enabling testability would cause debug extension to be used, even if it didn't load mir-debug extension.

Approved by: Unity8 CI Bot

358. By CI Train Bot Account on 2016-11-23

Releasing 0.63+17.04.20161123-0ubuntu1

357. By Gerry Boland on 2016-11-23

Fix for Qt5.6 mapToGlobal: QPlatformWindow::geometry() expected to be in absolute screens coordinates

Needed for Autopilot (LP: #1346633)

Approved by: Daniel d'Andrada, Unity8 CI Bot

356. By Gerry Boland on 2016-11-23

Enable Accessibility

Approved by: Nick Dedekind, Unity8 CI Bot