Merge lp://staging/~nick-dedekind/unity8/multi-monitor into lp://staging/unity8
Proposed by
Michael Zanetti
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~nick-dedekind/unity8/multi-monitor |
| Merge into: | lp://staging/unity8 |
| Diff against target: |
3616 lines (+1262/-646) 73 files modified
debian/control (+1/-1) debian/unity8.install (+5/-0) plugins/Cursor/CMakeLists.txt (+1/-0) plugins/Cursor/InputDispatcherFilter.cpp (+175/-0) plugins/Cursor/InputDispatcherFilter.h (+62/-0) plugins/Cursor/MousePointer.cpp (+65/-80) plugins/Cursor/MousePointer.h (+5/-4) plugins/GlobalShortcut/globalshortcut.cpp (+0/-15) plugins/GlobalShortcut/globalshortcut.h (+0/-4) plugins/GlobalShortcut/globalshortcutregistry.cpp (+23/-15) plugins/GlobalShortcut/globalshortcutregistry.h (+2/-2) plugins/UInput/plugin.cpp (+7/-1) qml/ApplicationMenus/ApplicationMenuItemFactory.qml (+4/-4) qml/ApplicationMenus/MenuBar.qml (+5/-1) qml/ApplicationMenus/MenuItem.qml (+2/-0) qml/ApplicationMenus/MenuPopup.qml (+4/-1) qml/CMakeLists.txt (+1/-1) qml/Components/PanelState/PanelState.qml (+0/-1) qml/Components/PanelState/qmldir (+1/-1) qml/Components/VirtualTouchPad.qml (+13/-19) qml/DisabledScreenNotice.qml (+2/-1) qml/ErrorApplication.qml (+67/-0) qml/Greeter/Greeter.qml (+21/-3) qml/Greeter/SecondaryGreeter.qml (+75/-0) qml/OrientedShell.qml (+5/-7) qml/Panel/Panel.qml (+17/-15) qml/Shell.qml (+29/-11) qml/ShellApplication.qml (+52/-0) qml/ShellNotifier.qml (+30/-0) qml/ShellScreen.qml (+66/-0) qml/Stage/DecoratedWindow.qml (+3/-1) qml/Stage/FakeMaximizeDelegate.qml (+12/-11) qml/Stage/Stage.qml (+13/-10) qml/Stage/WindowDecoration.qml (+2/-0) qml/qmldir (+1/-0) src/ApplicationArguments.cpp (+12/-3) src/ApplicationArguments.h (+19/-17) src/CMakeLists.txt (+0/-2) src/SecondaryWindow.cpp (+0/-40) src/SecondaryWindow.h (+0/-30) src/ShellApplication.cpp (+30/-105) src/ShellApplication.h (+1/-13) src/ShellView.cpp (+0/-85) src/ShellView.h (+0/-34) src/UnityCommandLineParser.h (+1/-1) tests/mocks/Cursor/Cursor.qml (+50/-3) tests/mocks/GSettings.1.0/plugin.cpp (+12/-0) tests/mocks/GSettings.1.0/plugin.h (+1/-0) tests/mocks/UInput/plugin.cpp (+6/-1) tests/mocks/Unity/Application/SurfaceManager.cpp (+1/-1) tests/mocks/Unity/InputInfo/mockcontroller.cpp (+10/-0) tests/mocks/Unity/InputInfo/mockcontroller.h (+3/-1) tests/mocks/Unity/InputInfo/plugin.cpp (+1/-2) tests/mocks/Unity/Screens/CMakeLists.txt (+2/-1) tests/mocks/Unity/Screens/plugin.cpp (+14/-1) tests/mocks/Unity/Screens/screens.cpp (+52/-9) tests/mocks/Unity/Screens/screens.h (+87/-7) tests/mocks/Unity/Screens/screenwindow.cpp (+35/-0) tests/mocks/Unity/Screens/screenwindow.h (+42/-0) tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp (+1/-0) tests/qmltests/ApplicationMenus/tst_MenuBar.qml (+2/-0) tests/qmltests/ApplicationMenus/tst_MenuPopup.qml (+2/-0) tests/qmltests/Components/tst_VirtualTouchPad.qml (+2/-2) tests/qmltests/Panel/tst_Panel.qml (+18/-14) tests/qmltests/Stage/tst_DecoratedWindow.qml (+5/-1) tests/qmltests/Stage/tst_DesktopStage.qml (+6/-4) tests/qmltests/Stage/tst_PhoneStage.qml (+2/-0) tests/qmltests/Stage/tst_WindowResizeArea.qml (+1/-8) tests/qmltests/Tutorial/tst_Tutorial.qml (+9/-17) tests/qmltests/tst_OrientedShell.qml (+25/-5) tests/qmltests/tst_Shell.qml (+30/-17) tests/qmltests/tst_ShellWithPin.qml (+7/-13) tests/uqmlscene/main.cpp (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~nick-dedekind/unity8/multi-monitor |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity8 CI Bot | continuous-integration | Needs Fixing | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
multimonitor support
Description of the change
Prereq-archive: ppa:ci-
WIP - putting to needs review to get jenkins' opinion
To post a comment you must log in.
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 2795. By Nick Dedekind
-
merged with trunk
- 2794. By Nick Dedekind
-
Added requestActivate to view
- 2793. By Nick Dedekind
-
more test fixes
- 2792. By Nick Dedekind
-
Stage fixes for panelState
- 2791. By Nick Dedekind
-
Fixed PhoneStage & ShellWithPin tests
- 2790. By Nick Dedekind
-
panelState fixes
- 2789. By Nick Dedekind
-
Panel bidnings for app menus
- 2788. By Nick Dedekind
-
Fixed shortcuts parented to non QuickItems
- 2787. By Nick Dedekind
-
removed Unity.Debug import
- 2786. By Nick Dedekind
-
fixed surfaceManager in tstShell
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:2787
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/