← Back to branch summary

~mterry/qtmir/warn-on-xapp

~mterry/qtmir/warn-on-xapp

Viewing all changes in revision 422.30.30.

Committer: Michał Sawicz
Date: 2016-04-06 18:12:31 UTC
mfrom: (422.29.15 surfaceListModel)
mto: (422.2.54 qtmir)
mto: This revision was merged to the branch mainline in revision 428.
Revision ID: michal.sawicz@canonical.com-20160406181231-yyl7c4c4a5obd0xi

Merge lp:~dandrader/qtmir/surfaceListModel

files added:
src/modules/Unity/Application/mirfocuscontroller.cpp

src/modules/Unity/Application/mirfocuscontroller.h

src/modules/Unity/Application/mirsurfacelistmodel.cpp

src/modules/Unity/Application/mirsurfacelistmodel.h

files removed:
src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

files modified:
CMakeLists.txt

README

debian/control

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

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

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirwindowmanager.cpp

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/fake_session.cpp

tests/framework/fake_session.h

tests/framework/mock_session.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Show diffs side-by-side

added added

removed removed

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

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

src/modules/Unity/Application/applicationscreenshotprovider.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/plugin.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirwindowmanager.cpp

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/fake_session.cpp

tests/framework/fake_session.h

tests/framework/mock_session.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

Older »