← Back to branch summary

~vanvugt/qtmir/smoother-mirsurfaceitem

~vanvugt/qtmir/smoother-mirsurfaceitem

Viewing all changes in revision 282.

Committer: Gerry Boland
Date: 2015-05-13 09:40:03 UTC
mfrom: (266.1.71 qtmir)
Revision ID: gerry.boland@canonical.com-20150513094003-cm26mgvv7218dbaw

Merge trunk & fix conflicts

files added:
src/modules/Unity/Application/com.canonical.qtmir.gschema.xml

src/modules/Unity/Application/settings.cpp

src/modules/Unity/Application/settings.h

src/modules/Unity/Application/settings_interface.h

tests/modules/common/mock_settings.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/qtdeclarative5-qtmir-plugin.install

src/common/debughelpers.cpp

src/common/debughelpers.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.cpp

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

src/modules/Unity/Application/proc_info.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/mirshell.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/qtdeclarative5-qtmir-plugin.install

src/common/debughelpers.cpp

src/common/debughelpers.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/com.canonical.qtmir.gschema.xml

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

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/settings.cpp

src/modules/Unity/Application/settings.h

src/modules/Unity/Application/settings_interface.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/mirshell.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/common/mock_settings.h

tests/modules/common/qtmir_test.h

Older »