← Back to branch summary

~mterry/qtmir/warn-on-xapp

~mterry/qtmir/warn-on-xapp

Viewing all changes in revision 428.

Committer: Michael Terry
Date: 2016-05-16 21:00:25 UTC
mfrom: (422.2.64 qtmir)
Revision ID: michael.terry@canonical.com-20160516210025-x83pyvom4whimnkn

Merge from trunk; disabled actual hooks for signals, will fix later

files added:
debian/bileto_convert_to_gles

debian/gles-patches

debian/gles-patches/convert-to-gles.patch

debian/gles-patches/series

demos/qml-demo-shell/Button.qml

src/modules/Unity/Application/applicationinfo.h

src/modules/Unity/Application/mirfocuscontroller.cpp

src/modules/Unity/Application/mirfocuscontroller.h

src/modules/Unity/Application/mirsurfacelistmodel.cpp

src/modules/Unity/Application/mirsurfacelistmodel.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/applicationinfo.cpp

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

src/modules/Unity/Screens/qquickscreenwindow.cpp

src/modules/Unity/Screens/qquickscreenwindow.h

src/platforms/mirserver/argvHelper.h

src/platforms/mirserver/creationhints.cpp

src/platforms/mirserver/creationhints.h

src/platforms/mirserver/customscreenconfiguration.h

src/platforms/mirserver/screenscontroller.cpp

src/platforms/mirserver/screenscontroller.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/convert-to-gles.sh

tests/framework/CMakeLists.txt

tests/framework/fake_application_info.cpp

tests/framework/fake_mirsurface.cpp

tests/framework/fake_session.cpp

tests/framework/mock_application_info.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

tests/mirserver/ArgvHelper

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

tests/mirserver/ScreensModel/stub_displayconfigurationcontroller.h

files removed:
debian/tests

debian/tests/control

debian/tests/run-tests

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

tests/common

tests/modules/DesktopFileReader

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/DesktopFileReader/calculator.desktop

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

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

src/platforms/mirserver/tileddisplayconfigurationpolicy.cpp => src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/tileddisplayconfigurationpolicy.h => src/platforms/mirserver/mirdisplayconfigurationpolicy.h

src/platforms/mirserver/screencontroller.cpp => src/platforms/mirserver/screensmodel.cpp

src/platforms/mirserver/screencontroller.h => src/platforms/mirserver/screensmodel.h

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

tests/modules/common/fake_desktopfilereader.h => tests/framework/fake_application_info.h

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

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

tests/modules/common/mock_desktop_file_reader.h => tests/framework/mock_application_info.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

tests/mirserver/ScreenController/ => tests/mirserver/ScreensModel/

tests/mirserver/ScreenController/screencontroller_test.cpp => tests/mirserver/ScreensModel/screensmodel_test.cpp

tests/mirserver/ScreenController/testable_screencontroller.h => tests/mirserver/ScreensModel/testable_screensmodel.h

files modified:
CMakeLists.txt

README

debian/changelog

debian/control

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

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

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

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

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/Screens/CMakeLists.txt

src/modules/Unity/Screens/plugin.cpp

src/modules/Unity/Screens/screens.cpp

src/modules/Unity/Screens/screens.h

src/platforms/mirserver/CMakeLists.txt

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

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/screenwindow.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

tests/CMakeLists.txt

tests/framework/fake_mirsurface.h

tests/framework/fake_session.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/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/ScreensModel/CMakeLists.txt

tests/mirserver/ScreensModel/stub_display.h

tests/mirserver/WindowManager/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/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/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/bileto_convert_to_gles

debian/changelog

debian/gles-patches/

debian/gles-patches/convert-to-gles.patch

debian/gles-patches/series

debian/tests/control

debian/tests/run-tests

demos/qml-demo-shell/Button.qml

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

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/applicationinfo.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/dbuswindowstack.cpp

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirfocuscontroller.cpp

src/modules/Unity/Application/mirfocuscontroller.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/mirsurfacelistmodel.cpp

src/modules/Unity/Application/mirsurfacelistmodel.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

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

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

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

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

src/modules/Unity/Screens/CMakeLists.txt

src/modules/Unity/Screens/plugin.cpp

src/modules/Unity/Screens/qquickscreenwindow.cpp

src/modules/Unity/Screens/qquickscreenwindow.h

src/modules/Unity/Screens/screens.cpp

src/modules/Unity/Screens/screens.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/argvHelper.h

src/platforms/mirserver/creationhints.cpp

src/platforms/mirserver/creationhints.h

src/platforms/mirserver/customscreenconfiguration.h

src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/mirdisplayconfigurationpolicy.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/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/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screenscontroller.cpp

src/platforms/mirserver/screenscontroller.h

src/platforms/mirserver/screensmodel.cpp

src/platforms/mirserver/screensmodel.h

src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/screenwindow.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/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/CMakeLists.txt

tests/convert-to-gles.sh

tests/framework/CMakeLists.txt

tests/framework/fake_application_info.cpp

tests/framework/fake_application_info.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_info.cpp

tests/framework/mock_application_info.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/ArgvHelper/

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

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/ScreensModel/CMakeLists.txt

tests/mirserver/ScreensModel/screensmodel_test.cpp

tests/mirserver/ScreensModel/stub_display.h

tests/mirserver/ScreensModel/stub_displayconfigurationcontroller.h

tests/mirserver/ScreensModel/testable_screensmodel.h

tests/mirserver/WindowManager/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/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/DesktopFileReader/

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/DesktopFileReader/calculator.desktop

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

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/CMakeLists.txt

tests/modules/TaskController/taskcontroller_test.cpp

Older »