Merge lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-058 into lp://staging/qtmir
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-058 |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
1170 lines (+391/-121) 35 files modified
cmake/modules/FindQt5PlatformSupport.cmake (+121/-0) debian/changelog (+25/-0) debian/copyright (+30/-0) src/modules/Unity/Application/application.cpp (+54/-28) src/modules/Unity/Application/application.h (+2/-3) src/modules/Unity/Application/application_manager.cpp (+4/-13) src/modules/Unity/Application/application_manager.h (+0/-5) src/modules/Unity/Application/mirsurface.cpp (+1/-0) src/modules/Unity/Application/mirsurface.h (+5/-2) src/modules/Unity/Application/mirsurfacemanager.cpp (+7/-8) src/modules/Unity/Application/mirsurfacemanager.h (+2/-5) src/modules/Unity/Application/sessionmanager.cpp (+0/-2) src/modules/Unity/Application/upstart/taskcontroller.cpp (+8/-1) src/platforms/mirserver/CMakeLists.txt (+4/-1) src/platforms/mirserver/clipboard.cpp (+0/-2) src/platforms/mirserver/logging.cpp (+26/-0) src/platforms/mirserver/miropenglcontext.cpp (+8/-8) src/platforms/mirserver/miropenglcontext.h (+6/-4) src/platforms/mirserver/mirserver.cpp (+2/-5) src/platforms/mirserver/mirserver.h (+2/-8) src/platforms/mirserver/mirserverintegration.cpp (+3/-1) src/platforms/mirserver/nativeinterface.cpp (+7/-1) src/platforms/mirserver/nativeinterface.h (+3/-2) src/platforms/mirserver/offscreensurface.cpp (+0/-2) src/platforms/mirserver/qmirserver_p.cpp (+4/-1) src/platforms/mirserver/qmirserver_p.h (+1/-2) src/platforms/mirserver/qteventfeeder.cpp (+0/-2) src/platforms/mirserver/screen.cpp (+0/-2) src/platforms/mirserver/screensmodel.cpp (+0/-2) src/platforms/mirserver/surfaceobserver.cpp (+32/-2) src/platforms/mirserver/surfaceobserver.h (+0/-1) tests/framework/qtmir_test.cpp (+2/-3) tests/framework/qtmir_test.h (+1/-1) tests/modules/Application/application_test.cpp (+27/-0) tests/modules/ApplicationManager/application_manager_test.cpp (+4/-4) |
| To merge this branch: | bzr merge lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-058 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 496. By CI Train Bot Account
-
Releasing 0.4.8+16.
04.20160518. 2-0ubuntu1 - 495. By Timo Jyrinki
-
Use FindQt5Platform
Support to find platform support, other methods not available on Qt 5.6 anymore. Fixes: #1554404
Approved by: Gerry Boland - 494. By Daniel d'Andrada
-
Also interpret the cursor names used by Mir client API Fixes: #1447839
Approved by: Michał Sawicz, Unity8 CI Bot - 493. By Michał Sawicz
-
Centralize logging categories
The header part is already centralized. Make the cpp the same.
Moves all logging category symbols to the mirserver lib.
Enables mirserver to use logging categories that were previously declared in the Unity.Application module.
Approved by: Unity8 CI Bot, Michael Terry - 492. By Alan Griffiths
-
Reduce coupling to MirServer - it has been misused as a context object.
Approved by: Alan Griffiths, Daniel d'Andrada, Unity8 CI Bot - 491. By Daniel d'Andrada
-
Application: Don't respawn if closed while still starting up
+ refactoring of Application:
:onSessionState Changed to explicitly cover every single internal state on session stopping. Fixes: #1575577
Approved by: Gerry Boland, Unity8 CI Bot, Michael Terry - 490. By Gerry Boland
-
UAL can throw on creating Application if invalid appId, catch instead of aborting Fixes: #1578258
Approved by: Unity8 CI Bot, Michael Terry
