← Back to branch summary

~nick-dedekind/qtmir/mock-task-controller

~nick-dedekind/qtmir/mock-task-controller

Viewing all changes in revision 351.

Committer: Nick Dedekind
Date: 2015-09-07 08:19:21 UTC
mfrom: (345.1.24 qtmir)
Revision ID: nick.dedekind@canonical.com-20150907081921-0qfdre9pqzlenmzw

merged with trunk

files added:
demos/qml-demo-shell/TitleBar.qml

demos/qml-demo-shell/WindowBufferSized.qml

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

tests/modules/common/fake_desktopfilereader.h

tests/modules/common/fake_session.h

files removed:
src/modules/Unity/Application/mirsurfaceiteminterface.h

src/modules/Unity/Application/mirsurfaceitemmodel.h

tests/modules/common/mock_mirsurfaceitem.h

files renamed:
src/platforms/mirserver/mirshell.cpp => src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirshell.h => src/platforms/mirserver/mirwindowmanager.h

tests/modules/common/fake_mirsurfaceitem.h => tests/modules/common/fake_mirsurface.h

files modified:
CMakeLists.txt

README

debian/changelog

debian/control

debian/copyright

debian/rules

demos/qml-demo-shell/Window.qml

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

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/common/debughelpers.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/applicationcontroller.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/dbuswindowstack.cpp

src/modules/Unity/Application/dbuswindowstack.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Application/sessionmanager.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/clipboard.cpp

src/platforms/mirserver/clipboard.h

src/platforms/mirserver/display.cpp

src/platforms/mirserver/display.h

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/displaywindow.h

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/mirserverstatuslistener.cpp

src/platforms/mirserver/mirserverstatuslistener.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.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/services.cpp

src/platforms/mirserver/services.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

src/platforms/mirserver/ubuntutheme.cpp

src/platforms/mirserver/ubuntutheme.h

tests/mirserver/Clipboard/clipboard_test.cpp

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/screen_test.cpp

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

tests/modules/General/objectlistmodel_test.cpp

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/TaskController/taskcontroller_test.cpp

tests/modules/common/mock_application_controller.h

tests/modules/common/mock_desktop_file_reader.h

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_proc_info.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_renderable.h

tests/modules/common/mock_session.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.cpp

tests/modules/common/qtmir_test.h

tests/modules/common/stub_input_channel.h

tests/modules/common/stub_scene_surface.h

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/copyright

demos/qml-demo-shell/TitleBar.qml

demos/qml-demo-shell/Window.qml

demos/qml-demo-shell/WindowBufferSized.qml

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

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/common/debughelpers.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/applicationcontroller.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/dbuswindowstack.cpp

src/modules/Unity/Application/dbuswindowstack.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfaceiteminterface.h

src/modules/Unity/Application/mirsurfaceitemmodel.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Application/sessionmanager.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/clipboard.cpp

src/platforms/mirserver/clipboard.h

src/platforms/mirserver/display.cpp

src/platforms/mirserver/display.h

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/displaywindow.h

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/mirserverstatuslistener.cpp

src/platforms/mirserver/mirserverstatuslistener.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.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/services.cpp

src/platforms/mirserver/services.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

src/platforms/mirserver/ubuntutheme.cpp

src/platforms/mirserver/ubuntutheme.h

tests/mirserver/Clipboard/clipboard_test.cpp

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/screen_test.cpp

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

tests/modules/General/objectlistmodel_test.cpp

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/TaskController/taskcontroller_test.cpp

tests/modules/common/fake_desktopfilereader.h

tests/modules/common/fake_mirsurface.h

tests/modules/common/fake_session.h

tests/modules/common/mock_application_controller.h

tests/modules/common/mock_desktop_file_reader.h

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_mirsurfaceitem.h

tests/modules/common/mock_proc_info.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_renderable.h

tests/modules/common/mock_session.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.cpp

tests/modules/common/qtmir_test.h

tests/modules/common/stub_input_channel.h

tests/modules/common/stub_scene_surface.h

Older »