Use the new plugin mechanism for Sensors and SensorGestures

Plugins no longer use QFactoryInterface or Q_EXPORT_PLUGIN. Instead,
Q_PLUGIN_METADATA is used.

Meta-data is provided through a .json file that is embedded into the
plugin by moc.

For now, this meta-data is not actually used because both sensors
and gestures use a dynamic registration mechanism.

Change-Id: Ic82657e2ba5768127e13f7411ca51f60772781d8
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

12 files changed, 18 insertions, 12 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/plugin.json b/src/plugins/sensorgestures/qtsensors/plugin.json
new file mode 100644
index 00000000..8a55b3ae
--- /dev/null
+++ b/src/plugins/sensorgestures/qtsensors/plugin.json
@@ -0,0 +1 @@
+{ "Keys": [ "notused" ] }
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
index e770d362..11044209 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
@@ -109,7 +109,4 @@ QList <QSensorGestureRecognizer *> QtSensorGesturePlugin::createRecognizers()
     return recognizers;
 }
 
-
-Q_EXPORT_PLUGIN2(qtsensorgestures_plugin, QtSensorGesturePlugin)
-
 QT_END_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 75e4a2f8..75045094 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -52,7 +52,8 @@ QT_BEGIN_NAMESPACE
 class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface)
+    Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json")
+    Q_INTERFACES(QSensorGesturePluginInterface)
 
 public:
     explicit QtSensorGesturePlugin();
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
index e469fda9..b02ef3db 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro
+++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
@@ -34,3 +34,6 @@ SOURCES += qtsensorgestureplugin.cpp \
 target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures
 INSTALLS += target
 
+OTHER_FILES += \
+    plugin.json
+
diff --git a/src/plugins/sensorgestures/shake/plugin.json b/src/plugins/sensorgestures/shake/plugin.json
new file mode 100644
index 00000000..8a55b3ae
--- /dev/null
+++ b/src/plugins/sensorgestures/shake/plugin.json
@@ -0,0 +1 @@
+{ "Keys": [ "notused" ] }
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
index 7bba6047..1c9b450e 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
@@ -74,6 +74,3 @@ QList <QSensorGestureRecognizer *> QShakeSensorGesturePlugin::createRecognizers(
 
     return recognizers;
 }
-
-Q_EXPORT_PLUGIN2(qtsensorgestures_shakeplugin, QShakeSensorGesturePlugin)
-
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index c7ad8d70..826ed0c4 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -50,7 +50,8 @@
 class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface)
+    Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json")
+    Q_INTERFACES(QSensorGesturePluginInterface)
 
 public:
     explicit QShakeSensorGesturePlugin();
diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro
index 80197c7e..a5e69783 100644
--- a/src/plugins/sensorgestures/shake/shake.pro
+++ b/src/plugins/sensorgestures/shake/shake.pro
@@ -15,3 +15,6 @@ SOURCES += qshakesensorgestureplugin.cpp \
 target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures
 INSTALLS += target
 
+OTHER_FILES += \
+    plugin.json
+
diff --git a/src/plugins/sensorgestures/simulator/plugin.json b/src/plugins/sensorgestures/simulator/plugin.json
new file mode 100644
index 00000000..8a55b3ae
--- /dev/null
+++ b/src/plugins/sensorgestures/simulator/plugin.json
@@ -0,0 +1 @@
+{ "Keys": [ "notused" ] }
diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp
index a8d45a11..66dcd854 100644
--- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp
@@ -75,6 +75,3 @@ QList <QSensorGestureRecognizer *> QSimulatorSensorGesturePlugin::createRecogniz
 
     return recognizers;
 }
-
-Q_EXPORT_PLUGIN2(QSimulatorSensorGestureRecognizer, QSimulatorSensorGesturePlugin)
-
diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h
index 9fe91bdd..4f598007 100644
--- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h
@@ -50,7 +50,8 @@
 class QSimulatorSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface)
+    Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json")
+    Q_INTERFACES(QSensorGesturePluginInterface)
 
 public:
     explicit QSimulatorSensorGesturePlugin();
diff --git a/src/plugins/sensorgestures/simulator/simulator.pro b/src/plugins/sensorgestures/simulator/simulator.pro
index 015d01f0..5f1712d1 100644
--- a/src/plugins/sensorgestures/simulator/simulator.pro
+++ b/src/plugins/sensorgestures/simulator/simulator.pro
@@ -21,4 +21,7 @@ SOURCES += \
     qsimulatorrecognizer.cpp\
     qsimulatorsensorgestureplugin.cpp
 
+OTHER_FILES += \
+    plugin.json
+