Merge lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-022 into lp://staging/qtmir
Proposed by
Michał Sawicz
| Status: | Merged |
|---|---|
| Merged at revision: | 428 |
| Proposed branch: | lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-022 |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
1650 lines (+687/-131) 24 files modified
CMakeLists.txt (+1/-1) debian/changelog (+21/-0) debian/control (+2/-2) 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) 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/common/fake_mirsurface.h (+7/-0) tests/modules/common/fake_session.h (+8/-2) 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/~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-022 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Description of the change
Only used to base new silos on this
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
