~lukas-kde/qtmir/betterSessionManagement

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/plugin.h

Committer: Lukáš Tinkl
Date: 2017-03-24 11:51:00 UTC
mfrom: (590.1.35 qtmir)
Revision ID: lukas.tinkl@canonical.com-20170324115100-n0itqdupc26qe6g6

merge trunk, resolve conflicts

files added:
src/modules/Unity/Application/sessionmap_interface.h

src/modules/Unity/Application/taskcontroller.cpp

src/platforms/mirserver/eventdispatch.cpp

src/platforms/mirserver/eventdispatch.h

src/platforms/mirserver/miral

src/platforms/mirserver/miral/CMakeLists.txt

src/platforms/mirserver/miral/edid.cpp

src/platforms/mirserver/miral/edid.h

src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/miral/mirbuffer.h

src/platforms/mirserver/miral/persist_display_config.cpp

src/platforms/mirserver/miral/persist_display_config.h

tests/check-requires-provides.sh

tests/framework/mock_sessionmap.h

tests/framework/mock_window_controller.h

tests/mirserver/miral

tests/mirserver/miral/CMakeLists.txt

tests/mirserver/miral/edid_test.cpp

tests/modules/SurfaceManager

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

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

src/modules/Unity/Application/sessionmanager.h

src/platforms/mirserver/argvHelper.h

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/mirserverstatuslistener.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:
CMakeLists.txt

debian/changelog

debian/control

debian/gles-patches/convert-to-gles.patch

src/common/mirqtconversion.h

src/common/windowmodelnotifier.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/mirbuffersgtexture.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

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/CMakeLists.txt

src/platforms/mirserver/eventbuilder.cpp

src/platforms/mirserver/eventbuilder.h

src/platforms/mirserver/logging.cpp

src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/mirdisplayconfigurationpolicy.h

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

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/screensmodel.cpp

src/platforms/mirserver/screensmodel.h

src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/tracepoints.tp

src/platforms/mirserver/windowmanagementpolicy.cpp

tests/CMakeLists.txt

tests/framework/CMakeLists.txt

tests/framework/fake_displayconfigurationoutput.h

tests/framework/fake_mirsurface.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/mirserver/EventBuilder/eventbuilder_test.cpp

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

tests/modules/WindowManager/mirsurface_test.cpp

Show diffs side-by-side

added added

removed removed

src/platforms/mirserver/plugin.h

* This program is free software: you can redistribute it and/or modify it under

* the terms of the GNU Lesser General Public License version 3, as published by

Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "mirserver.json")

public:

QPlatformIntegration *create(const QString &system, const QStringList &paramList, int &argc, char **argv) override;

QPlatformIntegration *create(const QString &system, const QStringList &paramList) override;

};

#endif // PLUGIN_H

Older »