Merge lp://staging/~vanvugt/qtmir/fix-buffers_ready_for_compositor into lp://staging/qtmir
Proposed by
Michał Sawicz
Status: | Merged |
---|---|
Approved by: | Gerry Boland |
Approved revision: | 320 |
Merged at revision: | 316 |
Proposed branch: | lp://staging/~vanvugt/qtmir/fix-buffers_ready_for_compositor |
Merge into: | lp://staging/qtmir |
Prerequisite: | lp://staging/~alan-griffiths/qtmir/port-to-msh-Shell |
Diff against target: |
75 lines (+9/-10) 3 files modified
src/modules/Unity/Application/mirsurfaceitem.cpp (+8/-8) tests/modules/common/mock_renderable.h (+0/-2) tests/modules/common/mock_surface.h (+1/-0) |
To merge this branch: | bzr merge lp://staging/~vanvugt/qtmir/fix-buffers_ready_for_compositor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gerry Boland (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+248511@code.staging.launchpad.net |
This proposal supersedes a proposal from 2015-02-03.
Commit message
QtMir changes required to support the Mir branch of the same name. Landing soon.
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
1. Latest Mir (0.11 branch or later)
2. The prereq branch listed above.
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, manual testing with qmlscene.
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
To post a comment you must log in.
FAILED: Continuous integration, rev:316 jenkins. qa.ubuntu. com/job/ qtmir-ci/ 207/ jenkins. qa.ubuntu. com/job/ qtmir-vivid- amd64-ci/ 58/console jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 58/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtmir- ci/207/ rebuild
http://