Merge lp:~alan-griffiths/qtmir/compatibility into lp:qtmir
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | Gerry Boland |
Approved revision: | 628 |
Merged at revision: | 634 |
Proposed branch: | lp:~alan-griffiths/qtmir/compatibility |
Merge into: | lp:qtmir |
Prerequisite: | lp:~alan-griffiths/qtmir/future-proof |
Diff against target: |
235 lines (+23/-107) 8 files modified
src/modules/Unity/Application/mirsurface.cpp (+15/-0) tests/framework/CMakeLists.txt (+0/-1) tests/framework/fake_surface.h (+2/-5) tests/framework/mock_mir_session.h (+4/-0) tests/framework/mock_surface.h (+2/-0) tests/framework/stub_input_channel.cpp (+0/-52) tests/framework/stub_input_channel.h (+0/-47) tests/framework/stub_scene_surface.h (+0/-2) |
To merge this branch: | bzr merge lp:~alan-griffiths/qtmir/compatibility |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gerry Boland (community) | Approve | ||
Unity8 CI Bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Compatibility with lp:mir and lp:~alan-griffiths/miral/1.3
To post a comment you must log in.
PASSED: Continuous integration, rev:628 /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/632/ /unity8- jenkins. ubuntu. com/job/ build/4691 /unity8- jenkins. ubuntu. com/job/ build-0- fetch/4719 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 4542 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 4542/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/4542 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/4542/ artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 4542 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 4542/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/4542 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/4542/ artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 4542 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 4542/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/4542 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/4542/ artifact/ output/ *zip*/output. zip
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: /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/632/ rebuild
https:/