Merge lp:~unity-team/qtmir/miral-qt-integration into lp:qtmir
Status: | Merged |
---|---|
Approved by: | Gerry Boland on 2016-12-07 |
Approved revision: | 587 |
Merged at revision: | 577 |
Proposed branch: | lp:~unity-team/qtmir/miral-qt-integration |
Merge into: | lp:qtmir |
Diff against target: |
12804 lines (+5168/-3676) 139 files modified
CMakeLists.txt (+7/-4) debian/changelog (+6/-0) debian/control (+8/-4) debian/gles-patches/convert-to-gles.patch (+1/-1) demos/paths.h.in (+19/-1) demos/qml-demo-shell/CMakeLists.txt (+1/-0) demos/qml-demo-shell/WindowModelDebugView.qml (+72/-0) demos/qml-demo-shell/main.cpp (+10/-6) demos/qml-demo-shell/pointerposition.cpp (+56/-0) demos/qml-demo-shell/pointerposition.h (+49/-0) demos/qml-demo-shell/windowModel.qml (+136/-0) src/common/appnotifier.h (+39/-0) src/common/debughelpers.cpp (+50/-16) src/common/debughelpers.h (+2/-0) src/common/mirqtconversion.h (+118/-0) src/common/windowcontrollerinterface.h (+58/-0) src/common/windowmodelnotifier.h (+95/-0) src/modules/Unity/Application/CMakeLists.txt (+4/-3) src/modules/Unity/Application/application.cpp (+7/-6) src/modules/Unity/Application/application.h (+1/-8) src/modules/Unity/Application/application_manager.cpp (+40/-75) src/modules/Unity/Application/application_manager.h (+7/-9) src/modules/Unity/Application/dbusfocusinfo.cpp (+12/-18) src/modules/Unity/Application/dbusfocusinfo.h (+0/-1) src/modules/Unity/Application/mirfocuscontroller.cpp (+0/-69) src/modules/Unity/Application/mirfocuscontroller.h (+0/-49) src/modules/Unity/Application/mirsurface.cpp (+476/-248) src/modules/Unity/Application/mirsurface.h (+61/-51) src/modules/Unity/Application/mirsurfaceinterface.h (+6/-12) src/modules/Unity/Application/mirsurfaceitem.cpp (+4/-33) src/modules/Unity/Application/mirsurfaceitem.h (+1/-5) src/modules/Unity/Application/mirsurfacelistmodel.cpp (+10/-4) src/modules/Unity/Application/mirsurfacemanager.cpp (+0/-188) src/modules/Unity/Application/mirsurfacemanager.h (+0/-99) src/modules/Unity/Application/plugin.cpp (+6/-18) src/modules/Unity/Application/session.cpp (+42/-28) src/modules/Unity/Application/session.h (+11/-12) src/modules/Unity/Application/session_interface.h (+8/-6) src/modules/Unity/Application/sessionmanager.cpp (+24/-37) src/modules/Unity/Application/sessionmanager.h (+11/-8) src/modules/Unity/Application/surfacemanager.cpp (+174/-0) src/modules/Unity/Application/surfacemanager.h (+73/-0) src/modules/Unity/Application/windowmodel.cpp (+235/-0) src/modules/Unity/Application/windowmodel.h (+83/-0) src/modules/Unity/Screens/CMakeLists.txt (+1/-1) src/modules/Unity/Screens/plugin.cpp (+1/-1) src/modules/Unity/Screens/qquickscreenwindow.cpp (+6/-6) src/modules/Unity/Screens/qquickscreenwindow.h (+6/-6) src/modules/Unity/Screens/screens.cpp (+1/-1) src/modules/Unity/Screens/screens.h (+2/-29) src/platforms/mirserver/CMakeLists.txt (+39/-25) src/platforms/mirserver/creationhints.cpp (+0/-67) src/platforms/mirserver/creationhints.h (+0/-56) src/platforms/mirserver/cursor.cpp (+1/-1) src/platforms/mirserver/customscreenconfiguration.h (+4/-2) src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp (+26/-1) src/platforms/mirserver/mirdisplayconfigurationpolicy.h (+6/-14) src/platforms/mirserver/miropenglcontext.cpp (+1/-0) src/platforms/mirserver/mirserver.cpp (+0/-234) src/platforms/mirserver/mirserver.h (+0/-71) src/platforms/mirserver/mirserverhooks.cpp (+184/-0) src/platforms/mirserver/mirserverhooks.h (+54/-0) src/platforms/mirserver/mirserverintegration.cpp (+2/-2) src/platforms/mirserver/mirserverstatuslistener.h (+1/-0) src/platforms/mirserver/mirsingleton.cpp (+1/-0) src/platforms/mirserver/mirwindowmanager.cpp (+0/-227) src/platforms/mirserver/mirwindowmanager.h (+0/-49) src/platforms/mirserver/nativeinterface.cpp (+1/-5) src/platforms/mirserver/nativeinterface.h (+2/-2) src/platforms/mirserver/offscreensurface.cpp (+0/-7) src/platforms/mirserver/openglcontextfactory.cpp (+51/-0) src/platforms/mirserver/openglcontextfactory.h (+47/-0) src/platforms/mirserver/promptsession.h (+62/-0) src/platforms/mirserver/promptsessionlistener.cpp (+2/-45) src/platforms/mirserver/promptsessionlistener.h (+19/-21) src/platforms/mirserver/promptsessionmanager.cpp (+47/-0) src/platforms/mirserver/promptsessionmanager.h (+49/-0) src/platforms/mirserver/qmirserver.cpp (+25/-52) src/platforms/mirserver/qmirserver.h (+4/-7) src/platforms/mirserver/qmirserver_p.cpp (+117/-25) src/platforms/mirserver/qmirserver_p.h (+56/-10) src/platforms/mirserver/qteventfeeder.cpp (+47/-23) src/platforms/mirserver/qteventfeeder.h (+6/-12) src/platforms/mirserver/screen.cpp (+26/-27) src/platforms/mirserver/screen.h (+9/-14) src/platforms/mirserver/screenscontroller.cpp (+1/-0) src/platforms/mirserver/screenscontroller.h (+4/-1) src/platforms/mirserver/screensmodel.cpp (+11/-5) src/platforms/mirserver/screensmodel.h (+8/-4) src/platforms/mirserver/screentypes.h (+60/-0) src/platforms/mirserver/sessionauthorizer.cpp (+5/-10) src/platforms/mirserver/sessionauthorizer.h (+7/-7) src/platforms/mirserver/sessionlistener.cpp (+0/-96) src/platforms/mirserver/sessionlistener.h (+0/-63) src/platforms/mirserver/setqtcompositor.cpp (+55/-0) src/platforms/mirserver/setqtcompositor.h (+47/-0) src/platforms/mirserver/surfaceobserver.cpp (+36/-177) src/platforms/mirserver/surfaceobserver.h (+9/-41) src/platforms/mirserver/windowcontroller.cpp (+103/-0) src/platforms/mirserver/windowcontroller.h (+54/-0) src/platforms/mirserver/windowmanagementpolicy.cpp (+335/-0) src/platforms/mirserver/windowmanagementpolicy.h (+96/-0) tests/framework/CMakeLists.txt (+2/-0) tests/framework/fake_displayconfigurationoutput.h (+1/-0) tests/framework/fake_mirsurface.cpp (+31/-10) tests/framework/fake_mirsurface.h (+18/-23) tests/framework/fake_session.cpp (+7/-5) tests/framework/fake_session.h (+5/-4) tests/framework/fake_surface.h (+2/-0) tests/framework/mock_mir_session.h (+9/-4) tests/framework/mock_session.h (+5/-4) tests/framework/mock_surface.h (+1/-0) tests/framework/qtmir_test.cpp (+28/-4) tests/framework/qtmir_test.h (+8/-5) tests/framework/stub_scene_surface.h (+108/-0) tests/framework/stub_windowcontroller.h (+44/-0) tests/mirserver/CMakeLists.txt (+0/-1) tests/mirserver/Screen/screen_test.cpp (+2/-2) tests/mirserver/ScreensModel/screensmodel_test.cpp (+3/-1) tests/mirserver/ScreensModel/stub_display.h (+10/-0) tests/mirserver/ScreensModel/testable_screensmodel.h (+3/-2) tests/mirserver/WindowManager/CMakeLists.txt (+0/-27) tests/mirserver/WindowManager/stub_session.cpp (+0/-147) tests/mirserver/WindowManager/stub_session.h (+0/-64) tests/mirserver/WindowManager/stub_surface.cpp (+0/-212) tests/mirserver/WindowManager/stub_surface.h (+0/-71) tests/mirserver/WindowManager/window_manager.cpp (+0/-332) tests/modules/Application/CMakeLists.txt (+1/-0) tests/modules/Application/application_test.cpp (+10/-10) tests/modules/ApplicationManager/CMakeLists.txt (+1/-0) tests/modules/ApplicationManager/application_manager_test.cpp (+202/-192) tests/modules/CMakeLists.txt (+1/-1) tests/modules/SessionManager/CMakeLists.txt (+1/-0) tests/modules/SessionManager/session_manager_test.cpp (+24/-16) tests/modules/SessionManager/session_test.cpp (+14/-13) tests/modules/WindowManager/CMakeLists.txt (+12/-6) tests/modules/WindowManager/mirsurface_test.cpp (+67/-52) tests/modules/WindowManager/mirsurfaceitem_test.cpp (+2/-2) tests/modules/WindowManager/windowmodel_test.cpp (+786/-0) |
To merge this branch: | bzr merge lp:~unity-team/qtmir/miral-qt-integration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot (community) | continuous-integration | 2016-12-01 | Approve on 2016-12-08 |
Gerry Boland (community) | code | 2016-12-01 | Approve on 2016-12-07 |
Review via email:
|
This proposal supersedes a proposal from 2016-11-03.
Commit message
Depend on MirAL
Import code from lp:miral/miral-qt (revision 435) where we had a fork of qtmir and were rewriting it to use MirAL's APIs
Description of the change
Prereq-archive: ppa:ci-
Needed:
https:/
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:572
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:573
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:574
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:575
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:576
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:577
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:578
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:579
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:580
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:581
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:582
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:583
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:584
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:584
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 585. By Daniel d'Andrada on 2016-12-01
-
Fix order of entries in debian/changelog
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:585
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Gerry Boland (gerboland) wrote : | # |
+++ src/common/
missing licence header
- 586. By Daniel d'Andrada on 2016-12-05
-
Add missing license header
Daniel d'Andrada (dandrader) wrote : | # |
On 05/12/2016 12:59, Gerry Boland wrote:
> Review: Needs Fixing
>
> +++ src/common/
> missing licence header
Fixed
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:586
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 587. By Daniel d'Andrada on 2016-12-07
-
findApplication
WithSurface is const
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:587
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:587
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 588. By Daniel d'Andrada on 2016-12-13
-
Mir 0.25 compat (merging upcoming trunk)
- 589. By Daniel d'Andrada on 2016-12-13
-
Bump dependency version of other mir packages
- 590. By Daniel d'Andrada on 2016-12-16
-
Fix bad merge
FAILED: Continuous integration, rev:571 /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/393/ /unity8- jenkins. ubuntu. com/job/ build/3249/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/3277 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 3131/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 3131/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/3131/ console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 3131/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 3131/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/3131/ console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 3131/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 3131/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/3131/ console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/393/ rebuild
https:/