diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-16 15:30:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 08:23:02 +0100 |
| commit | 7a8883c4342fbb17309cc7dfcc8f6829af33d0cd (patch) | |
| tree | 4ec484643709ae484fb975f8ef10ef5c5837c5b8 /src/plugins/platforms/cocoa | |
| parent | f0f78eb0a9cc5d5898937201baa0e543ce4cac22 (diff) | |
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 <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.json | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/main.mm | 6 |
3 files changed, 8 insertions, 2 deletions
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" |