← Back to branch summary

~unity-team/qtmir/set-display-config

~unity-team/qtmir/set-display-config

Viewing all changes in revision 490.

Committer: Gerry Boland
Date: 2016-04-13 14:25:42 UTC
mfrom: (434.6.30 qtmir)
Revision ID: gerry.boland@canonical.com-20160413142542-55wxtvx4b95p9yd1

Merge trunk

files added:
src/platforms/mirserver/argvHelper.h

src/platforms/mirserver/wm-wip

src/platforms/mirserver/wm-wip/CMakeLists.txt

src/platforms/mirserver/wm-wip/README

src/platforms/mirserver/wm-wip/server_example_basic_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_basic_window_manager.h

src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.h

src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.h

src/platforms/mirserver/wm-wip/server_example_window_management.cpp

src/platforms/mirserver/wm-wip/server_example_window_management.h

src/platforms/mirserver/wm-wip/server_example_window_management_info.cpp

src/platforms/mirserver/wm-wip/server_example_window_management_info.h

tests/mirserver/ArgvHelper

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

files removed:
debian/tests

debian/tests/control

debian/tests/run-tests

src/platforms/mirserver/windowmanagerlistener.cpp

src/platforms/mirserver/windowmanagerlistener.h

files renamed:
src/platforms/mirserver/sizehints.cpp => src/platforms/mirserver/creationhints.cpp

src/platforms/mirserver/sizehints.h => src/platforms/mirserver/creationhints.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/mock_display.h

tests/framework/mock_proc_info.cpp

tests/framework/mock_session.cpp

tests/framework/mock_task_controller.cpp

tests/framework/qtmir_test.cpp

tests/mirserver/CMakeLists.txt

tests/mirserver/WindowManager/CMakeLists.txt

tests/mirserver/WindowManager/stub_surface.cpp

tests/mirserver/WindowManager/stub_surface.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/tests/control

debian/tests/run-tests

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/argvHelper.h

src/platforms/mirserver/creationhints.cpp

src/platforms/mirserver/creationhints.h

src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

src/platforms/mirserver/windowmanagerlistener.cpp

src/platforms/mirserver/windowmanagerlistener.h

src/platforms/mirserver/wm-wip/

src/platforms/mirserver/wm-wip/CMakeLists.txt

src/platforms/mirserver/wm-wip/README

src/platforms/mirserver/wm-wip/server_example_basic_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_basic_window_manager.h

src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.h

src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.h

src/platforms/mirserver/wm-wip/server_example_window_management.cpp

src/platforms/mirserver/wm-wip/server_example_window_management.h

src/platforms/mirserver/wm-wip/server_example_window_management_info.cpp

src/platforms/mirserver/wm-wip/server_example_window_management_info.h

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/mock_display.h

tests/framework/mock_proc_info.cpp

tests/framework/mock_session.cpp

tests/framework/mock_task_controller.cpp

tests/framework/qtmir_test.cpp

tests/mirserver/ArgvHelper/

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

tests/mirserver/CMakeLists.txt

tests/mirserver/WindowManager/CMakeLists.txt

tests/mirserver/WindowManager/stub_surface.cpp

tests/mirserver/WindowManager/stub_surface.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Older »