Merge lp://staging/~nick-dedekind/qtmir/multi-monitor into lp://staging/qtmir
Proposed by
Michael Zanetti
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~nick-dedekind/qtmir/multi-monitor |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
4516 lines (+1745/-923) 63 files modified
demos/qml-demo-client/CMakeLists.txt (+4/-1) demos/qml-demo-shell/CMakeLists.txt (+3/-0) src/modules/Unity/Application/CMakeLists.txt (+1/-0) src/modules/Unity/Application/compositortextureprovider.cpp (+50/-0) src/modules/Unity/Application/compositortextureprovider.h (+62/-0) src/modules/Unity/Application/mirsurface.cpp (+105/-81) src/modules/Unity/Application/mirsurface.h (+11/-9) src/modules/Unity/Application/mirsurfaceinterface.h (+5/-5) src/modules/Unity/Application/mirsurfaceitem.cpp (+37/-21) src/modules/Unity/Application/mirsurfaceitem.h (+2/-2) src/modules/Unity/Screens/CMakeLists.txt (+2/-0) src/modules/Unity/Screens/plugin.cpp (+16/-2) src/modules/Unity/Screens/qquickscreenwindow.cpp (+28/-151) src/modules/Unity/Screens/qquickscreenwindow.h (+14/-23) src/modules/Unity/Screens/screen.cpp (+213/-0) src/modules/Unity/Screens/screen.h (+99/-0) src/modules/Unity/Screens/screens.cpp (+63/-49) src/modules/Unity/Screens/screens.h (+11/-10) src/modules/Unity/Screens/types.h (+41/-0) src/platforms/mirserver/CMakeLists.txt (+6/-2) src/platforms/mirserver/cursor.cpp (+149/-135) src/platforms/mirserver/cursor.h (+6/-15) src/platforms/mirserver/customscreenconfiguration.h (+3/-1) src/platforms/mirserver/mirdisplayconfigurationobserver.cpp (+63/-0) src/platforms/mirserver/mirdisplayconfigurationobserver.h (+56/-0) src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp (+2/-2) src/platforms/mirserver/miropenglcontext.cpp (+3/-3) src/platforms/mirserver/miropenglcontext.h (+2/-2) src/platforms/mirserver/mirserverhooks.cpp (+1/-1) src/platforms/mirserver/mirserverhooks.h (+1/-1) src/platforms/mirserver/mirserverintegration.cpp (+17/-18) src/platforms/mirserver/mirserverintegration.h (+2/-0) src/platforms/mirserver/nativeinterface.cpp (+1/-45) src/platforms/mirserver/nativeinterface.h (+0/-4) src/platforms/mirserver/platformscreen.cpp (+159/-74) src/platforms/mirserver/platformscreen.h (+49/-14) src/platforms/mirserver/qmirserver.cpp (+3/-1) src/platforms/mirserver/qmirserver.h (+1/-1) src/platforms/mirserver/qmirserver_p.cpp (+1/-2) src/platforms/mirserver/qmirserver_p.h (+3/-1) src/platforms/mirserver/qteventfeeder.cpp (+66/-57) src/platforms/mirserver/qteventfeeder.h (+10/-8) src/platforms/mirserver/screenplatformwindow.cpp (+141/-60) src/platforms/mirserver/screenplatformwindow.h (+24/-7) src/platforms/mirserver/screenscontroller.cpp (+60/-4) src/platforms/mirserver/screenscontroller.h (+5/-2) src/platforms/mirserver/screensmodel.cpp (+63/-56) src/platforms/mirserver/screensmodel.h (+11/-9) src/platforms/mirserver/screentypes.h (+2/-0) src/platforms/mirserver/setqtcompositor.cpp (+3/-1) src/platforms/mirserver/setqtcompositor.h (+2/-2) src/platforms/mirserver/windowmanagementpolicy.cpp (+2/-2) src/platforms/mirserver/windowmanagementpolicy.h (+4/-4) tests/framework/fake_mirsurface.cpp (+9/-9) tests/framework/fake_mirsurface.h (+5/-5) tests/mirserver/QtEventFeeder/CMakeLists.txt (+1/-0) tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h (+9/-4) tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+2/-2) tests/mirserver/Screen/screen_test.cpp (+6/-6) tests/mirserver/ScreensModel/screensmodel_test.cpp (+4/-4) tests/mirserver/ScreensModel/stub_screen.h (+4/-4) tests/mirserver/ScreensModel/testable_screensmodel.h (+1/-1) tests/modules/WindowManager/mirsurface_test.cpp (+16/-0) |
| To merge this branch: | bzr merge lp://staging/~nick-dedekind/qtmir/multi-monitor |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
multimontor support
Description of the change
WIP
related branches:
https:/
To post a comment you must log in.
Unmerged revisions
- 551. By Nick Dedekind
-
pre-review cleanup
- 550. By Nick Dedekind
-
display configuration observer. renames
- 549. By Nick Dedekind
-
removed debug
- 548. By Nick Dedekind
-
moved ScreenMode
- 547. By Nick Dedekind
-
removed unused window properties
- 546. By Nick Dedekind
-
ScreenConfig
- 545. By Nick Dedekind
-
Unity.Screens Screen
- 544. By Nick Dedekind
-
merged with trunk
- 543. By Nick Dedekind
-
screen
- 542. By Nick Dedekind
-
merged with trunk
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
