From 89486eb2109585f9bf0793e72e1a44b7ebf0d79c Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 5 Aug 2015 13:04:49 +0200 Subject: Standard Qt platform plugin setup Also rename ubuntumirclient -> mirclient Change-Id: I938722c38e903870867732e87bbdbba755dba2c6 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/platforms/mirclient/mirclient.json | 3 ++ src/plugins/platforms/mirclient/mirclient.pro | 47 +++++++++++++++++++++ src/plugins/platforms/mirclient/plugin.cpp | 4 +- src/plugins/platforms/mirclient/plugin.h | 2 +- .../platforms/mirclient/ubuntumirclient.json | 3 -- .../platforms/mirclient/ubuntumirclient.pro | 48 ---------------------- 6 files changed, 53 insertions(+), 54 deletions(-) create mode 100644 src/plugins/platforms/mirclient/mirclient.json create mode 100644 src/plugins/platforms/mirclient/mirclient.pro delete mode 100644 src/plugins/platforms/mirclient/ubuntumirclient.json delete mode 100644 src/plugins/platforms/mirclient/ubuntumirclient.pro diff --git a/src/plugins/platforms/mirclient/mirclient.json b/src/plugins/platforms/mirclient/mirclient.json new file mode 100644 index 0000000000..c31558a2f1 --- /dev/null +++ b/src/plugins/platforms/mirclient/mirclient.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "mirclient" ] +} diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro new file mode 100644 index 0000000000..c93fc530c0 --- /dev/null +++ b/src/plugins/platforms/mirclient/mirclient.pro @@ -0,0 +1,47 @@ +TARGET = mirclient +TEMPLATE = lib + +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 + +CONFIG += qpa/genericunixfontdatabase + +DEFINES += MESA_EGL_NO_X11_HEADERS +# CONFIG += c++11 # only enables C++0x +QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall +QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined + +CONFIG += link_pkgconfig +PKGCONFIG += egl mirclient ubuntu-platform-api + +SOURCES = \ + backingstore.cpp \ + clipboard.cpp \ + glcontext.cpp \ + input.cpp \ + integration.cpp \ + nativeinterface.cpp \ + platformservices.cpp \ + plugin.cpp \ + screen.cpp \ + theme.cpp \ + window.cpp + +HEADERS = \ + backingstore.h \ + clipboard.h \ + glcontext.h \ + input.h \ + integration.h \ + logging.h \ + nativeinterface.h \ + orientationchangeevent_p.h \ + platformservices.h \ + plugin.h \ + screen.h \ + theme.h \ + window.h diff --git a/src/plugins/platforms/mirclient/plugin.cpp b/src/plugins/platforms/mirclient/plugin.cpp index 6b245ea525..2d65aaae61 100644 --- a/src/plugins/platforms/mirclient/plugin.cpp +++ b/src/plugins/platforms/mirclient/plugin.cpp @@ -20,14 +20,14 @@ QStringList UbuntuMirClientIntegrationPlugin::keys() const { QStringList list; - list << "ubuntumirclient"; + list << "mirclient"; return list; } QPlatformIntegration* UbuntuMirClientIntegrationPlugin::create(const QString &system, const QStringList &) { - if (system.toLower() == "ubuntumirclient") { + if (system.toLower() == "mirclient") { #ifdef PLATFORM_API_TOUCH setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient", 1); #else diff --git a/src/plugins/platforms/mirclient/plugin.h b/src/plugins/platforms/mirclient/plugin.h index ac27f1aead..7a147bd4d1 100644 --- a/src/plugins/platforms/mirclient/plugin.h +++ b/src/plugins/platforms/mirclient/plugin.h @@ -22,7 +22,7 @@ class UbuntuMirClientIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ubuntumirclient.json") + Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "mirclient.json") public: QStringList keys() const; diff --git a/src/plugins/platforms/mirclient/ubuntumirclient.json b/src/plugins/platforms/mirclient/ubuntumirclient.json deleted file mode 100644 index c02432352f..0000000000 --- a/src/plugins/platforms/mirclient/ubuntumirclient.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "ubuntumirclient" ] -} diff --git a/src/plugins/platforms/mirclient/ubuntumirclient.pro b/src/plugins/platforms/mirclient/ubuntumirclient.pro deleted file mode 100644 index 0230abab3f..0000000000 --- a/src/plugins/platforms/mirclient/ubuntumirclient.pro +++ /dev/null @@ -1,48 +0,0 @@ -TARGET = qpa-ubuntumirclient -TEMPLATE = lib - -QT -= gui -QT += core-private gui-private platformsupport-private sensors dbus - -CONFIG += plugin no_keywords qpa/genericunixfontdatabase - -DEFINES += MESA_EGL_NO_X11_HEADERS -# CONFIG += c++11 # only enables C++0x -QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall -QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined - -CONFIG += link_pkgconfig -PKGCONFIG += egl mirclient ubuntu-platform-api - -SOURCES = \ - backingstore.cpp \ - clipboard.cpp \ - glcontext.cpp \ - input.cpp \ - integration.cpp \ - nativeinterface.cpp \ - platformservices.cpp \ - plugin.cpp \ - screen.cpp \ - theme.cpp \ - window.cpp - -HEADERS = \ - backingstore.h \ - clipboard.h \ - glcontext.h \ - input.h \ - integration.h \ - logging.h \ - nativeinterface.h \ - orientationchangeevent_p.h \ - platformservices.h \ - plugin.h \ - screen.h \ - theme.h \ - window.h - -# Installation path -target.path += $$[QT_INSTALL_PLUGINS]/platforms - -INSTALLS += target -- cgit v1.2.3