← Back to branch summary

~alan-griffiths/qtmir/introducing-QtmirWindowManagementPolicy

~alan-griffiths/qtmir/introducing-QtmirWindowManagementPolicy

Viewing all changes in revision 423.

Committer: Alan Griffiths
Date: 2016-03-07 17:44:54 UTC
mfrom: (417.1.35 qtmir)
Revision ID: alan@octopull.co.uk-20160307174454-12bqkjn1b2v7ixsx

Rather brutal merge\ lp:qtmir

files added:
src/modules/Unity/Application/timer.cpp

src/modules/Unity/Application/timer.h

src/modules/Unity/Application/timesource.cpp

src/modules/Unity/Application/timesource.h

src/platforms/mirserver/sizehints.cpp

src/platforms/mirserver/sizehints.h

tests/framework/CMakeLists.txt

tests/framework/fake_desktopfilereader.cpp

tests/framework/fake_mirsurface.cpp

tests/framework/fake_session.cpp

tests/framework/mock_desktop_file_reader.cpp

tests/framework/mock_display.cpp

tests/framework/mock_display_configuration.cpp

tests/framework/mock_gl_display_buffer.cpp

tests/framework/mock_main_loop.cpp

tests/framework/mock_mir_session.cpp

tests/framework/mock_proc_info.cpp

tests/framework/mock_prompt_session.cpp

tests/framework/mock_prompt_session_manager.cpp

tests/framework/mock_renderable.cpp

tests/framework/mock_session.cpp

tests/framework/mock_settings.cpp

tests/framework/mock_shared_wakelock.cpp

tests/framework/mock_surface.cpp

tests/framework/mock_task_controller.cpp

tests/framework/stub_input_channel.cpp

tests/framework/stub_scene_surface.cpp

files removed:
src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

tests/common

tests/modules/TaskController

tests/modules/TaskController/CMakeLists.txt

tests/modules/TaskController/taskcontroller_test.cpp

files renamed:
src/modules/Unity/Application/applicationcontroller.h => src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/upstart/applicationcontroller.cpp => src/modules/Unity/Application/upstart/taskcontroller.cpp

src/modules/Unity/Application/upstart/applicationcontroller.h => src/modules/Unity/Application/upstart/taskcontroller.h

tests/modules/common/ => tests/framework/

tests/common/fake_displayconfigurationoutput.h => tests/framework/fake_displayconfigurationoutput.h

tests/common/gmock_fixes.h => tests/framework/gmock_fixes.h

tests/common/mock_display.h => tests/framework/mock_display.h

tests/common/mock_display_configuration.h => tests/framework/mock_display_configuration.h

tests/common/mock_gl_display_buffer.h => tests/framework/mock_gl_display_buffer.h

tests/common/mock_main_loop.h => tests/framework/mock_main_loop.h

tests/modules/common/mock_application_controller.h => tests/framework/mock_task_controller.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/common/timestamp_impl.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/CMakeLists.txt

tests/framework/fake_desktopfilereader.h

tests/framework/fake_mirsurface.h

tests/framework/fake_session.h

tests/framework/mock_desktop_file_reader.h

tests/framework/mock_mir_session.h

tests/framework/mock_proc_info.h

tests/framework/mock_prompt_session.h

tests/framework/mock_prompt_session_manager.h

tests/framework/mock_renderable.h

tests/framework/mock_session.h

tests/framework/mock_settings.h

tests/framework/mock_shared_wakelock.h

tests/framework/mock_surface.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

tests/framework/stub_input_channel.h

tests/framework/stub_scene_surface.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/ScreenController/CMakeLists.txt

tests/mirserver/WindowManager/stub_session.cpp

tests/mirserver/WindowManager/stub_session.h

tests/mirserver/WindowManager/stub_surface.cpp

tests/mirserver/WindowManager/stub_surface.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/Application/CMakeLists.txt

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/mirsurface_test.cpp

tests/modules/SurfaceManager/mirsurfaceitem_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/timestamp_impl.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/timer.cpp

src/modules/Unity/Application/timer.h

src/modules/Unity/Application/timesource.cpp

src/modules/Unity/Application/timesource.h

src/modules/Unity/Application/upstart/taskcontroller.cpp

src/modules/Unity/Application/upstart/taskcontroller.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/sizehints.cpp

src/platforms/mirserver/sizehints.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/CMakeLists.txt

tests/framework/CMakeLists.txt

tests/framework/fake_desktopfilereader.cpp

tests/framework/fake_desktopfilereader.h

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/fake_session.cpp

tests/framework/fake_session.h

tests/framework/mock_desktop_file_reader.cpp

tests/framework/mock_desktop_file_reader.h

tests/framework/mock_display.cpp

tests/framework/mock_display.h

tests/framework/mock_display_configuration.cpp

tests/framework/mock_display_configuration.h

tests/framework/mock_gl_display_buffer.cpp

tests/framework/mock_gl_display_buffer.h

tests/framework/mock_main_loop.cpp

tests/framework/mock_main_loop.h

tests/framework/mock_mir_session.cpp

tests/framework/mock_mir_session.h

tests/framework/mock_proc_info.cpp

tests/framework/mock_proc_info.h

tests/framework/mock_prompt_session.cpp

tests/framework/mock_prompt_session.h

tests/framework/mock_prompt_session_manager.cpp

tests/framework/mock_prompt_session_manager.h

tests/framework/mock_renderable.cpp

tests/framework/mock_renderable.h

tests/framework/mock_session.cpp

tests/framework/mock_session.h

tests/framework/mock_settings.cpp

tests/framework/mock_settings.h

tests/framework/mock_shared_wakelock.cpp

tests/framework/mock_shared_wakelock.h

tests/framework/mock_surface.cpp

tests/framework/mock_surface.h

tests/framework/mock_task_controller.cpp

tests/framework/mock_task_controller.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

tests/framework/stub_input_channel.cpp

tests/framework/stub_input_channel.h

tests/framework/stub_scene_surface.cpp

tests/framework/stub_scene_surface.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/ScreenController/CMakeLists.txt

tests/mirserver/WindowManager/stub_session.cpp

tests/mirserver/WindowManager/stub_session.h

tests/mirserver/WindowManager/stub_surface.cpp

tests/mirserver/WindowManager/stub_surface.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/Application/CMakeLists.txt

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/mirsurface_test.cpp

tests/modules/SurfaceManager/mirsurfaceitem_test.cpp

tests/modules/TaskController/

tests/modules/TaskController/CMakeLists.txt

tests/modules/TaskController/taskcontroller_test.cpp

Older »