Merge lp://staging/qtmir/devel-mir-next into lp://staging/qtmir
Proposed by
Kevin DuBois
| Status: | Merged |
|---|---|
| Approved by: | Gerry Boland |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 429 |
| Proposed branch: | lp://staging/qtmir/devel-mir-next |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
1865 lines (+736/-139) 36 files modified
CMakeLists.txt (+1/-1) debian/changelog (+21/-0) debian/control (+5/-5) src/modules/Unity/Application/application.cpp (+79/-11) src/modules/Unity/Application/application.h (+11/-0) src/modules/Unity/Application/application_manager.cpp (+54/-12) src/modules/Unity/Application/application_manager.h (+4/-1) src/modules/Unity/Application/mirsurface.cpp (+23/-20) src/modules/Unity/Application/mirsurface.h (+2/-0) src/modules/Unity/Application/mirsurfaceinterface.h (+2/-0) src/modules/Unity/Application/mirsurfaceitem.cpp (+35/-6) src/modules/Unity/Application/mirsurfaceitem.h (+5/-0) src/modules/Unity/Application/mirsurfacemanager.cpp (+1/-1) src/modules/Unity/Application/session.cpp (+115/-56) src/modules/Unity/Application/session.h (+9/-4) src/modules/Unity/Application/session_interface.h (+17/-4) src/platforms/mirserver/mirwindowmanager.cpp (+12/-0) src/platforms/mirserver/sessionauthorizer.cpp (+10/-0) src/platforms/mirserver/sessionauthorizer.h (+1/-0) src/platforms/mirserver/surfaceobserver.cpp (+6/-1) src/platforms/mirserver/surfaceobserver.h (+2/-1) tests/common/mock_display_configuration.h (+1/-0) tests/mirserver/ScreenController/stub_display.h (+6/-0) tests/mirserver/WindowManager/stub_session.cpp (+4/-0) tests/mirserver/WindowManager/stub_session.h (+1/-1) tests/mirserver/WindowManager/window_manager.cpp (+1/-1) tests/modules/Application/CMakeLists.txt (+5/-0) tests/modules/ApplicationManager/application_manager_test.cpp (+264/-1) tests/modules/SessionManager/session_test.cpp (+3/-3) tests/modules/SurfaceManager/mirsurface_test.cpp (+1/-1) tests/modules/common/fake_mirsurface.h (+7/-0) tests/modules/common/fake_session.h (+8/-2) tests/modules/common/mock_mir_session.h (+1/-0) tests/modules/common/mock_session.h (+9/-6) tests/modules/common/qtmir_test.cpp (+3/-0) tests/modules/common/qtmir_test.h (+7/-1) |
| To merge this branch: | bzr merge lp://staging/qtmir/devel-mir-next |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | Approve | ||
| Gerry Boland (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
compatibility branch for Mir 0.18
Description of the change
compatibility branch for Mir 0.18
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Kevin DuBois (kdub) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Kevin DuBois (kdub) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:394
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://