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/minimal/main.cpp | 6 ++++-- src/plugins/platforms/minimal/minimal.json | 3 +++ src/plugins/platforms/minimal/minimal.pro | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/plugins/platforms/minimal/minimal.json (limited to 'src/plugins/platforms/minimal') diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp index 4d3b3a1362..8a6e8fb4b0 100644 --- a/src/plugins/platforms/minimal/main.cpp +++ b/src/plugins/platforms/minimal/main.cpp @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE class QMinimalIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "minimal.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -68,6 +70,6 @@ QPlatformIntegration *QMinimalIntegrationPlugin::create(const QString& system, c return 0; } -Q_EXPORT_PLUGIN2(minimal, QMinimalIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/platforms/minimal/minimal.json b/src/plugins/platforms/minimal/minimal.json new file mode 100644 index 0000000000..d3cf684b62 --- /dev/null +++ b/src/plugins/platforms/minimal/minimal.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "minimal" ] +} diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 392d12d19a..6430ccde75 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -10,5 +10,7 @@ SOURCES = main.cpp \ HEADERS = qminimalintegration.h \ qminimalbackingstore.h +OTHER_FILES += minimal.json + target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target -- cgit v1.2.3