← Back to branch summary

~mir-team/qtmir/mir-0.16-rebuild

~mir-team/qtmir/mir-0.16-rebuild

« back to all changes in this revision

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

Committer: Daniel d'Andrada
Date: 2015-05-21 18:48:59 UTC
mto: This revision was merged to the branch mainline in revision 340.
Revision ID: daniel.dandrada@canonical.com-20150521184859-362pnj4q1osoe63r

One include_directories(${APPLICATION_API_INCLUDE_DIRS}) to rule them all

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

src/platforms/mirserver/qmirserver_p.h

files renamed:
src/platforms/mirserver/mirwindowmanager.cpp => src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/mirwindowmanager.h => src/platforms/mirserver/mirshell.h

files modified:
debian/changelog

debian/control

debian/tests/run-tests *

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

src/common/debughelpers.h

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

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

src/platforms/mirserver/mirserver.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/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_surface.h

tests/modules/common/stub_scene_surface.h

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/sessionmanager.cpp

26

26

#include "nativeinterface.h"

27

27

#include "mirserver.h"

28

28

#include "sessionlistener.h"

29

#include "mirshell.h"

29

30

#include "logging.h"

30

31

#include "promptsessionlistener.h"

31

32

Older »