← Back to branch summary

~unity-team/qtmir/silo0

~unity-team/qtmir/silo0

Viewing all changes in revision 363.

Committer: Gerry Boland
Date: 2015-08-13 15:40:03 UTC
mfrom: (284.3.87 multimonitor-spike)
Revision ID: gerry.boland@canonical.com-20150813154003-wtxuekj2w4dem227

Merge multimonitor

files added:
src/modules/Unity/Screens

src/modules/Unity/Screens/CMakeLists.txt

src/modules/Unity/Screens/plugin.cpp

src/modules/Unity/Screens/qmldir

src/modules/Unity/Screens/screens.cpp

src/modules/Unity/Screens/screens.h

src/platforms/mirserver/offscreensurface.cpp

src/platforms/mirserver/offscreensurface.h

src/platforms/mirserver/screencontroller.cpp

src/platforms/mirserver/screencontroller.h

src/platforms/mirserver/tileddisplayconfigurationpolicy.cpp

src/platforms/mirserver/tileddisplayconfigurationpolicy.h

tests/common

tests/common/fake_displayconfigurationoutput.h

tests/common/gmock_fixes.h

tests/common/mock_display.h

tests/common/mock_display_buffer.h

tests/common/mock_display_configuration.h

tests/common/mock_main_loop.h

tests/mirserver/ScreenController

tests/mirserver/ScreenController/CMakeLists.txt

tests/mirserver/ScreenController/screencontroller_test.cpp

tests/mirserver/ScreenController/stub_display.h

tests/mirserver/ScreenController/stub_screen.h

tests/mirserver/ScreenController/testable_screencontroller.h

files renamed:
src/platforms/mirserver/display.cpp => src/platforms/mirserver/display.cpp.THIS

src/platforms/mirserver/display.h => src/platforms/mirserver/display.h.THIS

src/platforms/mirserver/displaywindow.cpp => src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/displaywindow.h => src/platforms/mirserver/screenwindow.h

files modified:
debian/changelog

demos/qml-demo-shell/qml-demo-shell.qml

src/modules/Unity/CMakeLists.txt

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/cursor.cpp

src/platforms/mirserver/cursor.h

src/platforms/mirserver/logging.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qtcompositor.cpp

src/platforms/mirserver/qtcompositor.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

tests/mirserver/CMakeLists.txt

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

debian/changelog

demos/qml-demo-shell/qml-demo-shell.qml

src/modules/Unity/CMakeLists.txt

src/modules/Unity/Screens/

src/modules/Unity/Screens/CMakeLists.txt

src/modules/Unity/Screens/plugin.cpp

src/modules/Unity/Screens/qmldir

src/modules/Unity/Screens/screens.cpp

src/modules/Unity/Screens/screens.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/cursor.cpp

src/platforms/mirserver/cursor.h

src/platforms/mirserver/logging.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/offscreensurface.cpp

src/platforms/mirserver/offscreensurface.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qtcompositor.cpp

src/platforms/mirserver/qtcompositor.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screencontroller.cpp

src/platforms/mirserver/screencontroller.h

src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/screenwindow.h

src/platforms/mirserver/tileddisplayconfigurationpolicy.cpp

src/platforms/mirserver/tileddisplayconfigurationpolicy.h

tests/common/fake_displayconfigurationoutput.h

tests/common/gmock_fixes.h

tests/common/mock_display.h

tests/common/mock_display_buffer.h

tests/common/mock_display_configuration.h

tests/common/mock_main_loop.h

tests/mirserver/CMakeLists.txt

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/mirserver/ScreenController/

tests/mirserver/ScreenController/CMakeLists.txt

tests/mirserver/ScreenController/screencontroller_test.cpp

tests/mirserver/ScreenController/stub_display.h

tests/mirserver/ScreenController/stub_screen.h

tests/mirserver/ScreenController/testable_screencontroller.h

tests/modules/common/qtmir_test.h

Older »