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>

diff --git a/src/plugins/platforms/linuxfb/linuxfb.json b/src/plugins/platforms/linuxfb/linuxfb.json
new file mode 100644 (file)
index 0000000..6cac1aa
--- /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 11b4a9c..9834dea 100644 (file)
--- 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 11f9799..e0348ab 100644 (file)
--- 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"
+