Commit 89486eb2 authored by Paul Olav Tvete's avatar Paul Olav Tvete
Browse files

Standard Qt platform plugin setup


Also rename ubuntumirclient -> mirclient

Change-Id: I938722c38e903870867732e87bbdbba755dba2c6
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
parent 39592451
No related merge requests found
Showing with 14 additions and 15 deletions
{
"Keys": [ "mirclient" ]
}
TARGET = qpa-ubuntumirclient TARGET = mirclient
TEMPLATE = lib TEMPLATE = lib
QT -= gui PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private sensors dbus QT += core-private gui-private platformsupport-private sensors dbus
CONFIG += plugin no_keywords qpa/genericunixfontdatabase CONFIG += qpa/genericunixfontdatabase
DEFINES += MESA_EGL_NO_X11_HEADERS DEFINES += MESA_EGL_NO_X11_HEADERS
# CONFIG += c++11 # only enables C++0x # CONFIG += c++11 # only enables C++0x
...@@ -35,14 +39,9 @@ HEADERS = \ ...@@ -35,14 +39,9 @@ HEADERS = \
integration.h \ integration.h \
logging.h \ logging.h \
nativeinterface.h \ nativeinterface.h \
orientationchangeevent_p.h \ orientationchangeevent_p.h \
platformservices.h \ platformservices.h \
plugin.h \ plugin.h \
screen.h \ screen.h \
theme.h \ theme.h \
window.h window.h
# Installation path
target.path += $$[QT_INSTALL_PLUGINS]/platforms
INSTALLS += target
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
QStringList UbuntuMirClientIntegrationPlugin::keys() const QStringList UbuntuMirClientIntegrationPlugin::keys() const
{ {
QStringList list; QStringList list;
list << "ubuntumirclient"; list << "mirclient";
return list; return list;
} }
QPlatformIntegration* UbuntuMirClientIntegrationPlugin::create(const QString &system, QPlatformIntegration* UbuntuMirClientIntegrationPlugin::create(const QString &system,
const QStringList &) const QStringList &)
{ {
if (system.toLower() == "ubuntumirclient") { if (system.toLower() == "mirclient") {
#ifdef PLATFORM_API_TOUCH #ifdef PLATFORM_API_TOUCH
setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient", 1); setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient", 1);
#else #else
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
class UbuntuMirClientIntegrationPlugin : public QPlatformIntegrationPlugin class UbuntuMirClientIntegrationPlugin : public QPlatformIntegrationPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json") Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "mirclient.json")
public: public:
QStringList keys() const; QStringList keys() const;
......
{
"Keys": [ "ubuntumirclient" ]
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment