From 7a8883c4342fbb17309cc7dfcc8f6829af33d0cd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 16 Feb 2012 15:30:37 +0100 Subject: Fix naming of plugins for QPA plugins and use new plugin system. - Fix naming "com.nokia" -> "org.qt-project" in platform integration & platform theme. - Adapt Windows, XCB, Cocoa, Minimal. Change-Id: I7834f5c3d94473b6f06c1bffee074a70ee25f426 Reviewed-by: Lars Knoll --- src/plugins/platforms/xcb/main.cpp | 6 ++++-- src/plugins/platforms/xcb/xcb.json | 3 +++ src/plugins/platforms/xcb/xcb.pro | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/plugins/platforms/xcb/xcb.json (limited to 'src/plugins/platforms/xcb') diff --git a/src/plugins/platforms/xcb/main.cpp b/src/plugins/platforms/xcb/main.cpp index 5aa3e921f3..50c5a1a017 100644 --- a/src/plugins/platforms/xcb/main.cpp +++ b/src/plugins/platforms/xcb/main.cpp @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE class QXcbIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "xcb.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -66,6 +68,6 @@ QPlatformIntegration* QXcbIntegrationPlugin::create(const QString& system, const return 0; } -Q_EXPORT_PLUGIN2(xcb, QXcbIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/platforms/xcb/xcb.json b/src/plugins/platforms/xcb/xcb.json new file mode 100644 index 0000000000..dc09d7b54f --- /dev/null +++ b/src/plugins/platforms/xcb/xcb.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "xcb" ] +} diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 50ca8bf269..7bad2b4dad 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -108,5 +108,7 @@ QT += dbus LIBS += -ldbus-1 } +OTHER_FILES += xcb.json + target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target -- cgit v1.2.3