← Back to branch summary

~lukas-kde/qtmir/betterSessionManagement

~lukas-kde/qtmir/betterSessionManagement

Viewing all changes in revision 590.23.16.

Committer: Gerry Boland
Date: 2017-03-24 11:29:56 UTC
mfrom: (590.1.35 qtmir)
mto: (590.24.1 keyState)
mto: This revision was merged to the branch mainline in revision 596.
Revision ID: gerry.boland@canonical.com-20170324112956-pwlzbn3jw43879ly

Merge trunk & fix build failure

files added:
src/modules/Unity/Application/sessionmap_interface.h

src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/miral/mirbuffer.h

tests/framework/mock_sessionmap.h

tests/framework/mock_window_controller.h

tests/modules/SurfaceManager

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

files modified:
CMakeLists.txt

debian/changelog

debian/control

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

src/common/windowmodelnotifier.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.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/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/eventbuilder.cpp

src/platforms/mirserver/eventbuilder.h

src/platforms/mirserver/miral/CMakeLists.txt

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/windowmanagementpolicy.cpp

tests/framework/CMakeLists.txt

tests/framework/fake_mirsurface.h

tests/mirserver/EventBuilder/eventbuilder_test.cpp

tests/modules/CMakeLists.txt

tests/modules/WindowManager/mirsurface_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

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

src/common/windowmodelnotifier.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.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/sessionmap_interface.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/eventbuilder.cpp

src/platforms/mirserver/eventbuilder.h

src/platforms/mirserver/miral/CMakeLists.txt

src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/miral/mirbuffer.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/windowmanagementpolicy.cpp

tests/framework/CMakeLists.txt

tests/framework/fake_mirsurface.h

tests/framework/mock_sessionmap.h

tests/framework/mock_window_controller.h

tests/mirserver/EventBuilder/eventbuilder_test.cpp

tests/modules/CMakeLists.txt

tests/modules/SurfaceManager/

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

tests/modules/WindowManager/mirsurface_test.cpp

Older »