Merge lp://staging/~nick-dedekind/qtmir/screens-api into lp://staging/qtmir
Proposed by
Nick Dedekind
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~nick-dedekind/qtmir/screens-api |
| Merge into: | lp://staging/qtmir |
| Prerequisite: | lp://staging/~nick-dedekind/qtmir/multiwindow.configuration |
| Diff against target: |
3924 lines (+1579/-1208) 68 files modified
cmake/modules/UseLttngGenTp.cmake (+1/-1) debian/changelog (+4/-2) demos/qml-demo-shell/CMakeLists.txt (+2/-0) demos/qml-demo-shell/Shell.qml (+0/-171) demos/qml-demo-shell/main.cpp (+10/-0) demos/qml-demo-shell/qml-demo-shell.qml (+7/-1) demos/qml-demo-shell/screens.cpp (+100/-0) demos/qml-demo-shell/screens.h (+58/-0) demos/qml-demo-shell/screenwindow.cpp (+47/-0) demos/qml-demo-shell/screenwindow.h (+49/-0) include/qtmir/miral/display_configuration_storage.h (+5/-11) include/qtmir/miral/display_id.h (+23/-0) include/qtmir/mirserverapplication.h (+12/-1) include/qtmir/qtmir.h (+14/-0) include/qtmir/screen.h (+120/-0) include/qtmir/screens.h (+50/-0) include/qtmir/types.h (+0/-3) include/qtmir/windowmanagementpolicy.h (+10/-3) src/common/windowmodelnotifier.h (+25/-1) src/common/workspacecontrollerinterface.h (+50/-0) src/modules/Unity/Application/CMakeLists.txt (+10/-5) src/modules/Unity/Application/application_manager.cpp (+1/-1) src/modules/Unity/Application/mirsurface.cpp (+30/-0) src/modules/Unity/Application/mirsurface.h (+3/-1) src/modules/Unity/Application/plugin.cpp (+7/-1) src/modules/Unity/Application/surfacemanager.cpp (+120/-80) src/modules/Unity/Application/surfacemanager.h (+24/-12) src/modules/Unity/Application/windowmodel.cpp (+2/-34) src/modules/Unity/Application/windowmodel.h (+0/-4) src/modules/Unity/CMakeLists.txt (+0/-1) src/modules/Unity/Screens/CMakeLists.txt (+0/-35) src/modules/Unity/Screens/plugin.cpp (+0/-59) src/modules/Unity/Screens/qmldir (+0/-2) src/modules/Unity/Screens/qquickscreenwindow.cpp (+0/-62) src/modules/Unity/Screens/qquickscreenwindow.h (+0/-51) src/modules/Unity/Screens/screen.cpp (+0/-213) src/modules/Unity/Screens/screen.h (+0/-99) src/modules/Unity/Screens/screens.cpp (+0/-140) src/modules/Unity/Screens/screens.h (+0/-70) src/modules/Unity/Screens/types.h (+0/-41) src/platforms/mirserver/CMakeLists.txt (+18/-3) src/platforms/mirserver/customscreenconfiguration.h (+0/-45) src/platforms/mirserver/miral/CMakeLists.txt (+1/-0) src/platforms/mirserver/miral/persist_display_config.cpp (+2/-2) src/platforms/mirserver/mirserverapplication.cpp (+5/-3) src/platforms/mirserver/platformscreen.cpp (+13/-4) src/platforms/mirserver/platformscreen.h (+6/-3) src/platforms/mirserver/qmirserver.cpp (+2/-0) src/platforms/mirserver/qmirserver_p.cpp (+1/-0) src/platforms/mirserver/qmirserver_p.h (+5/-0) src/platforms/mirserver/qtmir.cpp (+15/-0) src/platforms/mirserver/screenadaptor.cpp (+175/-0) src/platforms/mirserver/screenadaptor.h (+66/-0) src/platforms/mirserver/screenadaptormodel.cpp (+99/-0) src/platforms/mirserver/screenadaptormodel.h (+45/-0) src/platforms/mirserver/screenplatformwindow.cpp (+2/-2) src/platforms/mirserver/screenscontroller.cpp (+8/-9) src/platforms/mirserver/screenscontroller.h (+5/-5) src/platforms/mirserver/screensmodel.cpp (+3/-3) src/platforms/mirserver/screensmodel.h (+3/-3) src/platforms/mirserver/windowmodelnotifier.cpp (+109/-0) src/platforms/mirserver/workspacecontroller.cpp (+54/-0) src/platforms/mirserver/workspacecontroller.h (+49/-0) src/platforms/mirserver/wrappedwindowmanagementpolicy.cpp (+71/-0) src/platforms/mirserver/wrappedwindowmanagementpolicy.h (+17/-2) tests/mirserver/Screen/CMakeLists.txt (+1/-0) tests/mirserver/ScreensModel/CMakeLists.txt (+1/-0) tests/modules/SurfaceManager/surface_manager_test.cpp (+19/-19) |
| To merge this branch: | bzr merge lp://staging/~nick-dedekind/qtmir/screens-api |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
Screens API
Description of the change
Screens API
To post a comment you must log in.
Unmerged revisions
- 635. By Nick Dedekind
-
changelog
- 634. By Nick Dedekind
-
changelog update
- 633. By Nick Dedekind
-
merged pre-req
- 632. By Nick Dedekind
-
merged with pre-req
- 631. By Nick Dedekind
-
include def
- 630. By Nick Dedekind
-
DisplayId
- 629. By Nick Dedekind
-
better lttng deps
- 628. By Nick Dedekind
-
merged with pre-req
- 627. By Nick Dedekind
-
merged parent
- 626. By Nick Dedekind
-
merged with parent
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
