← Back to branch summary

~unity-team/qtmir/kbdLayout

~unity-team/qtmir/kbdLayout

Viewing all changes in revision 440.

Committer: Michał Sawicz
Date: 2016-02-03 00:02:12 UTC
mfrom: (381.4.13 qtmir)
Revision ID: michal.sawicz@canonical.com-20160203000212-spc8g14tv8eed149

Merge lp:~nick-dedekind/qtmir/qtmir-test-build

files added:
tests/framework/CMakeLists.txt

tests/framework/fake_desktopfilereader.cpp

tests/framework/fake_mirsurface.cpp

tests/framework/fake_session.cpp

tests/framework/mock_application_controller.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/stub_input_channel.cpp

tests/framework/stub_scene_surface.cpp

files removed:
tests/common

files renamed:
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

files modified:
CMakeLists.txt

tests/CMakeLists.txt

tests/framework/fake_desktopfilereader.h

tests/framework/fake_mirsurface.h

tests/framework/fake_session.h

tests/framework/mock_application_controller.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/Screen/CMakeLists.txt

tests/mirserver/ScreenController/CMakeLists.txt

tests/modules/Application/CMakeLists.txt

tests/modules/ApplicationManager/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/mirsurfaceitem_test.cpp

tests/modules/TaskController/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

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_application_controller.cpp

tests/framework/mock_application_controller.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/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/Screen/CMakeLists.txt

tests/mirserver/ScreenController/CMakeLists.txt

tests/modules/Application/CMakeLists.txt

tests/modules/ApplicationManager/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/mirsurfaceitem_test.cpp

tests/modules/TaskController/CMakeLists.txt

Older »