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/gui/kernel/qplatformintegrationplugin_qpa.h | 2 +- src/gui/kernel/qplatformthemeplugin_qpa.h | 2 +- src/plugins/platforms/cocoa/cocoa.json | 3 +++ src/plugins/platforms/cocoa/cocoa.pro | 1 + src/plugins/platforms/cocoa/main.mm | 6 ++++-- src/plugins/platforms/minimal/main.cpp | 6 ++++-- src/plugins/platforms/minimal/minimal.json | 3 +++ src/plugins/platforms/minimal/minimal.pro | 2 ++ src/plugins/platforms/windows/main.cpp | 6 ++++-- src/plugins/platforms/windows/windows.json | 3 +++ src/plugins/platforms/windows/windows.pro | 2 ++ src/plugins/platforms/xcb/main.cpp | 6 ++++-- src/plugins/platforms/xcb/xcb.json | 3 +++ src/plugins/platforms/xcb/xcb.pro | 2 ++ 14 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 src/plugins/platforms/cocoa/cocoa.json create mode 100644 src/plugins/platforms/minimal/minimal.json create mode 100644 src/plugins/platforms/windows/windows.json create mode 100644 src/plugins/platforms/xcb/xcb.json diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin_qpa.h index 84c2567bbd..d70569cbba 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.h +++ b/src/gui/kernel/qplatformintegrationplugin_qpa.h @@ -68,7 +68,7 @@ struct QPlatformIntegrationFactoryInterface : public QFactoryInterface virtual QPlatformIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; -#define QPlatformIntegrationFactoryInterface_iid "com.nokia.Qt.QPlatformIntegrationFactoryInterface" +#define QPlatformIntegrationFactoryInterface_iid "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" Q_DECLARE_INTERFACE(QPlatformIntegrationFactoryInterface, QPlatformIntegrationFactoryInterface_iid) diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.h b/src/gui/kernel/qplatformthemeplugin_qpa.h index fb4f9f9b7c..3ce7cc5b02 100644 --- a/src/gui/kernel/qplatformthemeplugin_qpa.h +++ b/src/gui/kernel/qplatformthemeplugin_qpa.h @@ -68,7 +68,7 @@ struct QPlatformThemeFactoryInterface : public QFactoryInterface virtual QPlatformTheme *create(const QString &key, const QStringList ¶mList) = 0; }; -#define QPlatformThemeFactoryInterface_iid "com.nokia.Qt.QPlatformThemeFactoryInterface" +#define QPlatformThemeFactoryInterface_iid "org.qt-project.Qt.QPlatformThemeFactoryInterface" Q_DECLARE_INTERFACE(QPlatformThemeFactoryInterface, QPlatformThemeFactoryInterface_iid) diff --git a/src/plugins/platforms/cocoa/cocoa.json b/src/plugins/platforms/cocoa/cocoa.json new file mode 100644 index 0000000000..520c4f5a50 --- /dev/null +++ b/src/plugins/platforms/cocoa/cocoa.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "cocoa" ] +} diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 1e803a1c7c..45dd3525d5 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -59,6 +59,7 @@ LIBS += -framework Cocoa QT += core-private gui-private widgets-private platformsupport-private +OTHER_FILES += cocoa.json target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm index 334a1fefc3..9857a4e177 100644 --- a/src/plugins/platforms/cocoa/main.mm +++ b/src/plugins/platforms/cocoa/main.mm @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE class QCocoaIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "cocoa.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -71,6 +73,6 @@ QPlatformIntegration * QCocoaIntegrationPlugin::create(const QString& system, co return 0; } -Q_EXPORT_PLUGIN2(CocoaIntegration, QCocoaIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" 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 diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp index d54a1dbb89..f16eff5449 100644 --- a/src/plugins/platforms/windows/main.cpp +++ b/src/plugins/platforms/windows/main.cpp @@ -100,6 +100,8 @@ QT_BEGIN_NAMESPACE class QWindowsIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "windows.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -118,6 +120,6 @@ QPlatformIntegration *QWindowsIntegrationPlugin::create(const QString& system, c return 0; } -Q_EXPORT_PLUGIN2(windows, QWindowsIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/platforms/windows/windows.json b/src/plugins/platforms/windows/windows.json new file mode 100644 index 0000000000..05032c1b72 --- /dev/null +++ b/src/plugins/platforms/windows/windows.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "windows" ] +} diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 58a117b8af..bb41fe87fc 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -149,5 +149,7 @@ contains(QT_CONFIG, freetype) { } } +OTHER_FILES += windows.json + target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target 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