~nick-dedekind/qtmir/multiwindow.textures

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/mirserverapplication.cpp

Committer: Nick Dedekind
Date: 2017-03-16 15:00:39 UTC
mfrom: (569.16.56 qtmir.api)
Revision ID: nick.dedekind@canonical.com-20170316150039-4z1o932owo6bp7fw

merged parent

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

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

src/modules/Unity/Application/sessionmanager.h

src/platforms/mirserver/argvHelper.h

tests/mirserver/ArgvHelper

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

files renamed:
tests/modules/SessionManager/ => tests/modules/Session/

tests/modules/SessionManager/session_manager_test.cpp => tests/modules/Session/taskcontroller_test.cpp

files modified:
debian/changelog

debian/control

src/common/mirqtconversion.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/dbusfocusinfo.cpp

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/modules/Unity/Application/taskcontroller.h

src/platforms/mirserver/logging.cpp

src/platforms/mirserver/mirserverapplication.cpp

src/platforms/mirserver/mirserverhooks.cpp

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

tests/framework/mock_task_controller.cpp

tests/framework/mock_task_controller.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

tests/mirserver/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/Session/CMakeLists.txt

tests/modules/Session/session_test.cpp

Show diffs side-by-side

added added

removed removed

src/platforms/mirserver/mirserverapplication.cpp

QSharedPointer<QMirServer> mirServer;

void init(int &argc, char **argv, std::initializer_list<std::function<void(QMirServer&)>> const& options)

void init(std::initializer_list<std::function<void(QMirServer&)>> const& options)

{

setenv("QT_QPA_PLATFORM", "mirserver", 1 /* overwrite */);

mirServer = QMirServer::create(argc, argv);

mirServer = QMirServer::create();

for (auto& option : options) {

option(*mirServer.data());

}

MirServerApplication::MirServerApplication(int &argc,

char **argv,

std::initializer_list<std::function<void(QMirServer&)>> options)

: QGuiApplication((init(argc, argv, options), argc), argv) // comma operator to ensure init called before QGuiApplication

: QGuiApplication((init(options), argc), argv) // comma operator to ensure init called before QGuiApplication

{

Q_UNUSED(options);

}

Older »