← 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 270.

Committer: Robert Carr
Date: 2015-02-02 15:22:58 UTC
mfrom: (266.1.43 qtmir)
Revision ID: racarr@ocelot-20150202152258-mwpui9t69jr3liyl

Merge trunk

files added:
src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/modules/Unity/Application/sharedwakelock.cpp

src/modules/Unity/Application/sharedwakelock.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/modules/Application

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/SharedWakelock

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/common/mock_shared_wakelock.h

files modified:
debian/changelog

debian/control

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

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/session.cpp

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

src/platforms/mirserver/services.cpp

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

tests/modules/CMakeLists.txt

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.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/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/sharedwakelock.cpp

src/modules/Unity/Application/sharedwakelock.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

src/platforms/mirserver/services.cpp

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/modules/Application/

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/CMakeLists.txt

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SharedWakelock/

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_shared_wakelock.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.h

Older »