Merge lp://staging/~unity-team/qtmir/persistent_surface_id into lp://staging/qtmir
Proposed by
Daniel d'Andrada
Status: | Merged |
---|---|
Approved by: | Daniel d'Andrada |
Approved revision: | no longer in the source branch. |
Merged at revision: | 555 |
Proposed branch: | lp://staging/~unity-team/qtmir/persistent_surface_id |
Merge into: | lp://staging/qtmir |
Diff against target: |
527 lines (+128/-18) 21 files modified
CMakeLists.txt (+1/-1) debian/control (+4/-2) debian/gles-patches/convert-to-gles.patch (+2/-2) src/modules/Unity/Application/mirsurface.cpp (+10/-3) src/modules/Unity/Application/mirsurface.h (+4/-0) src/modules/Unity/Application/mirsurfacemanager.cpp (+15/-2) src/modules/Unity/Application/mirsurfacemanager.h (+6/-1) src/platforms/mirserver/mirserver.h (+1/-0) src/platforms/mirserver/nativeinterface.cpp (+5/-0) src/platforms/mirserver/nativeinterface.h (+2/-0) src/platforms/mirserver/qmirserver.cpp (+7/-0) src/platforms/mirserver/qmirserver.h (+2/-0) tests/framework/CMakeLists.txt (+1/-0) tests/framework/fake_mirsurface.cpp (+2/-0) tests/framework/fake_mirsurface.h (+1/-0) tests/framework/mock_persistent_surface_store.cpp (+30/-0) tests/framework/mock_persistent_surface_store.h (+24/-0) tests/framework/qtmir_test.cpp (+2/-1) tests/framework/qtmir_test.h (+3/-0) tests/modules/SurfaceManager/mirsurface_test.cpp (+4/-4) tests/modules/SurfaceManager/mirsurfaceitem_test.cpp (+2/-2) |
To merge this branch: | bzr merge lp://staging/~unity-team/qtmir/persistent_surface_id |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada (community) | Approve | ||
Unity8 CI Bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+303580@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-06-14.
Commit message
Added implementation for MirSurfaceInter
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
To post a comment you must log in.
FAILED: Continuous integration, rev:506 /unity8- jenkins. ubuntu. com/job/ lp-qtmir- ci/273/ /unity8- jenkins. ubuntu. com/job/ build/1942/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/1968 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1902 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 1902 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 1902 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1893/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1893/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: 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/273/ rebuild
https:/