Merge lp://staging/~unity-team/qtmir/liveCaption into lp://staging/qtmir
Status: | Merged |
---|---|
Approved by: | Daniel d'Andrada |
Approved revision: | 391 |
Merged at revision: | 393 |
Proposed branch: | lp://staging/~unity-team/qtmir/liveCaption |
Merge into: | lp://staging/qtmir |
Prerequisite: | lp://staging/~alan-griffiths/qtmir/small-refactoring-of-MirWindowManager |
Diff against target: |
127 lines (+23/-10) 6 files modified
CMakeLists.txt (+1/-1) debian/control (+1/-1) src/modules/Unity/Application/mirsurface.cpp (+1/-1) src/platforms/mirserver/mirwindowmanager.cpp (+12/-5) src/platforms/mirserver/surfaceobserver.cpp (+5/-0) src/platforms/mirserver/surfaceobserver.h (+3/-2) |
To merge this branch: | bzr merge lp://staging/~unity-team/qtmir/liveCaption |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Daniel d'Andrada (community) | Approve | ||
Gerry Boland | Pending | ||
Review via email: mp+273071@code.staging.launchpad.net |
Commit message
React to surface modifications (window caption)
Description of the change
React to surface modifications (window caption)
Cf. https:/
* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes, build depends on this unity-api MP: https:/
Functionality-wise, also depends on qtubuntu MP: https:/
To actually see the results you also need: https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes
* If you changed the UI, has there been a design review?
N/A
FAILED: Continuous integration, rev:391 jenkins. qa.ubuntu. com/job/ qtmir-ci/ 470/ jenkins. qa.ubuntu. com/job/ qtmir-vivid- amd64-ci/ 166/console jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 166/console jenkins. qa.ubuntu. com/job/ qtmir-vivid- i386-ci/ 48/console jenkins. qa.ubuntu. com/job/ qtmir-wily- amd64-ci/ 203/console jenkins. qa.ubuntu. com/job/ qtmir-wily- armhf-ci/ 203/console jenkins. qa.ubuntu. com/job/ qtmir-wily- i386-ci/ 48/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtmir- ci/470/ rebuild
http://