From 394e45199fa1aa45036dd787c5052ef7bcd98c52 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 25 Feb 2012 12:12:09 +0100 Subject: directfb: Switch to the new style plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The plugin might advertize more keys than supported at runtime. E.g. the directfbegl key might not be available. I would like to have a directfb.json.in and then generate the right file or if moc would pre-process the file... Change-Id: Ia8ad4e1367c06f5e35d02822d4f830ce1e9dc577 Reviewed-by: Jørgen Lind --- src/plugins/platforms/directfb/directfb.json | 3 +++ src/plugins/platforms/directfb/directfb.pro | 2 ++ src/plugins/platforms/directfb/main.cpp | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/plugins/platforms/directfb/directfb.json (limited to 'src') diff --git a/src/plugins/platforms/directfb/directfb.json b/src/plugins/platforms/directfb/directfb.json new file mode 100644 index 0000000000..5c74095fe6 --- /dev/null +++ b/src/plugins/platforms/directfb/directfb.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "directfb", "directfbegl" ] +} diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 0585777889..ae47ec397b 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -43,3 +43,5 @@ directfbegl: { CONFIG += qpa/genericunixfontdatabase target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target + +OTHER_FILES += directfb.json diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp index 048e9ed611..26bdd719ca 100644 --- a/src/plugins/platforms/directfb/main.cpp +++ b/src/plugins/platforms/directfb/main.cpp @@ -57,6 +57,8 @@ QT_BEGIN_NAMESPACE class QDirectFbIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "directfb.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -86,6 +88,6 @@ QPlatformIntegration * QDirectFbIntegrationPlugin::create(const QString& system, return integration; } -Q_EXPORT_PLUGIN2(directfb, QDirectFbIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" -- cgit v1.2.3