← Back to branch summary

~unity-team/qtmir/dpr

~unity-team/qtmir/dpr

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/mirsurfacemanager.cpp

Committer: Gerry Boland
Date: 2015-12-14 12:28:33 UTC
mfrom: (321.2.107 qtmir)
Revision ID: gerry.boland@canonical.com-20151214122833-gcdw2xaji4jd4027

Merge trunk

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

src/platforms/mirserver/mircursorimages.h

src/platforms/mirserver/namedcursor.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/common/debughelpers.cpp

src/common/debughelpers.h

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

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

src/modules/Unity/Application/objectlistmodel.h

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/cursor.cpp

src/platforms/mirserver/cursor.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/modules/Application/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/mirsurface_test.cpp

tests/modules/SurfaceManager/mirsurfaceitem_test.cpp

tests/modules/common/fake_mirsurface.h

tests/modules/common/fake_session.h

tests/modules/common/mock_proc_info.h

tests/modules/common/mock_session.h

tests/modules/common/qtmir_test.cpp

tests/modules/common/qtmir_test.h

tests/modules/common/stub_scene_surface.h

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/mirsurfacemanager.cpp

110

110

}

111

111

112

112

if (session)

113

session->setSurface(qmlSurface);

113

session->registerSurface(qmlSurface);

114

114

115

115

// Only notify QML of surface creation once it has drawn its first frame.

116

116

connect(qmlSurface, &MirSurfaceInterface::firstFrameDrawn, this, [=]() {

Older »