← Back to branch summary

~mir-team/qtmir/compatibility-with-mir-API-changes

~mir-team/qtmir/compatibility-with-mir-API-changes

Viewing all changes in revision 268.

Committer: Cemil Azizoglu
Date: 2015-01-05 16:25:16 UTC
mfrom: (266.1.30 qtmir)
Revision ID: cemil.azizoglu@canonical.com-20150105162516-vt9dmnjdvng11yu8

Merge trunk

files added:
CMakeLists.txt

cmake

cmake/modules

cmake/modules/FindGLESv2.cmake

cmake/modules/QmlPlugins.cmake

cmake/modules/QmlTest.cmake

cmake/modules/UseLttngGenTp.cmake

cmake/modules/autopilot.cmake

src/CMakeLists.txt

src/modules/CMakeLists.txt

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/gscopedpointer.h

src/modules/Unity/CMakeLists.txt

src/platforms/CMakeLists.txt

src/platforms/mirserver/CMakeLists.txt

tests/CMakeLists.txt

tests/mirserver/CMakeLists.txt

tests/mirserver/Clipboard/CMakeLists.txt

tests/mirserver/QtEventFeeder/CMakeLists.txt

tests/mirserver/Screen

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

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

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/SessionManager/CMakeLists.txt

tests/modules/TaskController/CMakeLists.txt

files removed:
qtmir.pro

src/lttng-compiler.pri

src/modules/Unity/Application/Application.pro

src/modules/Unity/Application/processcontroller.cpp

src/modules/Unity/Application/processcontroller.h

src/modules/modules.pro

src/platforms/mirserver/mirserver.pro

src/platforms/platforms.pro

src/src.pro

tests/google-mock.pri

tests/mirserver/Clipboard/Clipboard.pro

tests/mirserver/QtEventFeeder/QtEventFeeder.pro

tests/mirserver/mirserver.pro

tests/modules/ApplicationManager/ApplicationManager.pro

tests/modules/General/General.pro

tests/modules/MirSurfaceItem/MirSurfaceItem.pro

tests/modules/SessionManager/SessionManager.pro

tests/modules/TaskController/TaskController.pro

tests/modules/common/common.pri

tests/modules/common/mock_oom_controller.h

tests/modules/common/mock_process_controller.h

tests/modules/modules.pro

tests/test-includes.pri

tests/tests.pro

files renamed:
src/platforms/mirserver/mirserverconfiguration.cpp => src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserverconfiguration.h => src/platforms/mirserver/mirserver.h

files modified:
README

debian/changelog

debian/control

debian/rules

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/applicationcontroller.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

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/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/modules/Unity/Application/upstart/applicationcontroller.cpp

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

src/platforms/mirserver/display.cpp

src/platforms/mirserver/display.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/TaskController/taskcontroller_test.cpp

tests/modules/common/mock_application_controller.h

tests/modules/common/mock_proc_info.h

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

cmake/modules/FindGLESv2.cmake

cmake/modules/QmlPlugins.cmake

cmake/modules/QmlTest.cmake

cmake/modules/UseLttngGenTp.cmake

cmake/modules/autopilot.cmake

debian/changelog

src/CMakeLists.txt

src/lttng-compiler.pri

src/modules/CMakeLists.txt

src/modules/Unity/Application/Application.pro

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/applicationcontroller.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/gscopedpointer.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

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

src/modules/Unity/Application/processcontroller.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/modules/Unity/Application/upstart/applicationcontroller.cpp

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

src/modules/Unity/CMakeLists.txt

src/modules/modules.pro

src/platforms/CMakeLists.txt

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/display.cpp

src/platforms/mirserver/display.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserver.pro

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/platforms.pro

tests/CMakeLists.txt

tests/google-mock.pri

tests/mirserver/CMakeLists.txt

tests/mirserver/Clipboard/CMakeLists.txt

tests/mirserver/Clipboard/Clipboard.pro

tests/mirserver/QtEventFeeder/CMakeLists.txt

tests/mirserver/QtEventFeeder/QtEventFeeder.pro

tests/mirserver/Screen/

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/mirserver/mirserver.pro

tests/modules/ApplicationManager/ApplicationManager.pro

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

tests/modules/General/General.pro

tests/modules/MirSurfaceItem/CMakeLists.txt

tests/modules/MirSurfaceItem/MirSurfaceItem.pro

tests/modules/SessionManager/CMakeLists.txt

tests/modules/SessionManager/SessionManager.pro

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/TaskController/CMakeLists.txt

tests/modules/TaskController/TaskController.pro

tests/modules/TaskController/taskcontroller_test.cpp

tests/modules/common/common.pri

tests/modules/common/mock_application_controller.h

tests/modules/common/mock_oom_controller.h

tests/modules/common/mock_proc_info.h

tests/modules/common/mock_process_controller.h

tests/modules/common/qtmir_test.h

tests/modules/modules.pro

tests/test-includes.pri

tests/tests.pro

Older »