diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-02-25 12:12:09 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 00:17:17 +0100 |
| commit | 394e45199fa1aa45036dd787c5052ef7bcd98c52 (patch) | |
| tree | 8d9ae916d0f3c05d23ed51aef818d4be37ce93cd /src | |
| parent | b51296c06433d4923e4dcfd2bc104ae3ab67fb43 (diff) | |
directfb: Switch to the new style plugins
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 <jorgen.lind@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/directfb/directfb.json | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/directfb/directfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/directfb/main.cpp | 6 |
3 files changed, 9 insertions, 2 deletions
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" |