← Back to branch summary

~vanvugt/qtmir/smoother-mirsurfaceitem

~vanvugt/qtmir/smoother-mirsurfaceitem

Viewing all changes in revision 283.

Committer: Andreas Pokorny
Date: 2015-06-24 17:17:08 UTC
mfrom: (266.1.79 qtmir)
Revision ID: andreas.pokorny@canonical.com-20150624171708-06yyt3kzsiynd2sj

merge trunk

files added:
src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/tests/run-tests *

demos/qml-demo-shell/qml-demo-shell.qml

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

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

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

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

demos/qml-demo-shell/qml-demo-shell.qml

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

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

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

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

Older »