diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-07-02 18:19:55 +0530 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 06:06:27 +0200 |
| commit | 018cd808fd8dbe5ccd88021d50b6b16162ab0631 (patch) | |
| tree | ee0f0e74c1c08cc916d0fd97172130132aa051bb /src/plugins/platforms | |
| parent | 58f644dbcffdb9afc77c5635b732c88c2660a79d (diff) | |
linuxfb: add linuxfb.json and moc main.cpp
This makes the linuxfb plugin load
Change-Id: Idbe888b5795f8ac86f1e3cf197e42c99cca04818
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/linuxfb/linuxfb.json | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/linuxfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/main.cpp | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/platforms/linuxfb/linuxfb.json b/src/plugins/platforms/linuxfb/linuxfb.json new file mode 100644 index 0000000000..6cac1aa536 --- /dev/null +++ b/src/plugins/platforms/linuxfb/linuxfb.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "linuxfb" ] +} diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index 11b4a9c82a..9834dea7d5 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -12,3 +12,5 @@ CONFIG += qpa/genericunixfontdatabase target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target + +OTHER_FILES += linuxfb.json diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp index 11f97996fb..e0348abac4 100644 --- a/src/plugins/platforms/linuxfb/main.cpp +++ b/src/plugins/platforms/linuxfb/main.cpp @@ -46,7 +46,8 @@ QT_BEGIN_NAMESPACE class QLinuxFbIntegrationPlugin : public QPlatformIntegrationPlugin { - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1") + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "linuxfb.json") public: QPlatformIntegration *create(const QString&, const QStringList&); }; @@ -61,3 +62,6 @@ QPlatformIntegration* QLinuxFbIntegrationPlugin::create(const QString& system, c } QT_END_NAMESPACE + +#include "main.moc" + |