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>

4 files changed, 13 insertions, 14 deletions

diff --git a/src/plugins/sensors/dummy/dummy.pri b/src/plugins/sensors/dummy/dummy.pri
deleted file mode 100644
index 502081c7..00000000
--- a/src/plugins/sensors/dummy/dummy.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-HEADERS += dummycommon.h\
-           dummyaccelerometer.h\
-           dummylightsensor.h\
-
-SOURCES += dummycommon.cpp\
-           dummyaccelerometer.cpp\
-           dummylightsensor.cpp\
-           main.cpp\
-
diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro
index b49c0be8..2cf13924 100644
--- a/src/plugins/sensors/dummy/dummy.pro
+++ b/src/plugins/sensors/dummy/dummy.pro
@@ -7,7 +7,16 @@ load(qt_plugin)
 
 DESTDIR = $$QT.sensors.plugins/sensors
 
-include(dummy.pri)
+HEADERS += dummycommon.h\
+           dummyaccelerometer.h\
+           dummylightsensor.h
+
+SOURCES += dummycommon.cpp\
+           dummyaccelerometer.cpp\
+           dummylightsensor.cpp\
+           main.cpp
+
+OTHER_FILES = plugin.json
 
 unix:!mac:LIBS+=-lrt
 
diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp
index b9aa7d2e..df69c5f9 100644
--- a/src/plugins/sensors/dummy/main.cpp
+++ b/src/plugins/sensors/dummy/main.cpp
@@ -50,7 +50,8 @@
 class dummySensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory
 {
     Q_OBJECT
-    Q_INTERFACES(QSensorPluginInterface:QFactoryInterface)
+    Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
+    Q_INTERFACES(QSensorPluginInterface)
 public:
     void registerSensors()
     {
@@ -71,10 +72,7 @@ public:
 
         return 0;
     }
-    QStringList keys() const { return QStringList() << "dummy";}
 };
 
-Q_EXPORT_PLUGIN2(qtsensors_dummy, dummySensorPlugin)
-
 #include "main.moc"
 
diff --git a/src/plugins/sensors/dummy/plugin.json b/src/plugins/sensors/dummy/plugin.json
new file mode 100644
index 00000000..8a55b3ae
--- /dev/null
+++ b/src/plugins/sensors/dummy/plugin.json
@@ -0,0 +1 @@
+{ "Keys": [ "notused" ] }