Merge lp://staging/~mir-team/qtmir/iteration-0-of-miral-PersistDisplayConfig into lp://staging/~unity-team/qtmir/miral-qt-integration
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~mir-team/qtmir/iteration-0-of-miral-PersistDisplayConfig |
Merge into: | lp://staging/~unity-team/qtmir/miral-qt-integration |
Diff against target: |
393 lines (+241/-24) 11 files modified
CMakeLists.txt (+0/-4) debian/changelog (+17/-0) src/modules/Unity/Application/application_manager.cpp (+2/-3) src/modules/Unity/Application/application_manager.h (+1/-6) src/platforms/mirserver/CMakeLists.txt (+3/-0) src/platforms/mirserver/miral/CMakeLists.txt (+5/-0) src/platforms/mirserver/miral/persist_display_config.cpp (+147/-0) src/platforms/mirserver/miral/persist_display_config.h (+52/-0) src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp (+4/-8) src/platforms/mirserver/mirdisplayconfigurationpolicy.h (+6/-2) src/platforms/mirserver/qmirserver_p.cpp (+4/-1) |
To merge this branch: | bzr merge lp://staging/~mir-team/qtmir/iteration-0-of-miral-PersistDisplayConfig |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nick Dedekind (community) | Needs Information | ||
Review via email: mp+311762@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2017-01-05.
Commit message
Iteration 0 of miral::
Unmerged revisions
- 592. By Nick Dedekind
-
merged trunk
- 591. By Alan Griffiths
-
Fix for Mir-0.26 release
- 590. By Nick Dedekind
-
merged with trunk
- 589. By Alan Griffiths
-
qtmir::miral => miral
- 588. By Alan Griffiths
-
Cannot use the_display_
configuration_ observer_ registrar( ) before init - 587. By Alan Griffiths
-
Don't break with Mir-0.25
- 586. By Alan Griffiths
-
Plumbing for detecting changes to base config
- 585. By Alan Griffiths
-
Hack a way to use the existing DisplayConfigur
ationPolicy - 584. By Alan Griffiths
-
Better names, better comments
- 583. By Alan Griffiths
-
Null implementation
Looks fine for iter 0.