diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2012-02-26 12:23:12 +0100 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2012-02-29 16:29:18 +0100 |
| commit | f94f62467efae154642560062fe10e1b607fdc12 (patch) | |
| tree | ea7a7c9ecc1a714cad0a04ea8bc7c698637a422a | |
| parent | cdb8ca28a820338ffc4e86f7d6adb17ea232f0c7 (diff) | |
conform to new plugin api
Change-Id: I42c05384767989aa95b49abfadd875d0f8b157d4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/plugins/platforms/wayland/main.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.json | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/platforms/wayland/main.cpp b/src/plugins/platforms/wayland/main.cpp index 70f92f307..08d4c5ae7 100644 --- a/src/plugins/platforms/wayland/main.cpp +++ b/src/plugins/platforms/wayland/main.cpp @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "wayland.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -67,6 +69,6 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c return 0; } -Q_EXPORT_PLUGIN2(wayland, QWaylandIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/platforms/wayland/wayland.json b/src/plugins/platforms/wayland/wayland.json new file mode 100644 index 000000000..8e56c4fd8 --- /dev/null +++ b/src/plugins/platforms/wayland/wayland.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "wayland" ] +} diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index a3ad15d1d..9d43c877d 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -66,6 +66,8 @@ HEADERS = qwaylandintegration.h \ qwaylandtouch.h \ $$PWD/../../../shared/qwaylandmimehelper.h +OTHER_FILES += wayland.json + INCLUDEPATH += $$PWD/../../../shared INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND |