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, 12 insertions, 14 deletions

diff --git a/src/plugins/sensors/generic/generic.pri b/src/plugins/sensors/generic/generic.pri
deleted file mode 100644
index 69efdc06..00000000
--- a/src/plugins/sensors/generic/generic.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-HEADERS += genericorientationsensor.h\
-           genericrotationsensor.h\
-           genericalssensor.h
-
-SOURCES += genericorientationsensor.cpp\
-           main.cpp\
-           genericrotationsensor.cpp\
-           genericalssensor.cpp
-
diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro
index 3d9e9cc4..c5b2bab7 100644
--- a/src/plugins/sensors/generic/generic.pro
+++ b/src/plugins/sensors/generic/generic.pro
@@ -7,8 +7,16 @@ load(qt_plugin)
 
 DESTDIR = $$QT.sensors.plugins/sensors
 
-include(generic.pri)
+HEADERS += genericorientationsensor.h\
+           genericrotationsensor.h\
+           genericalssensor.h
 
+SOURCES += genericorientationsensor.cpp\
+           main.cpp\
+           genericrotationsensor.cpp\
+           genericalssensor.cpp
+
+OTHER_FILES = plugin.json
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp
index f8bd9f45..f0af75be 100644
--- a/src/plugins/sensors/generic/main.cpp
+++ b/src/plugins/sensors/generic/main.cpp
@@ -51,7 +51,8 @@
 class genericSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorChangesInterface, public QSensorBackendFactory
 {
     Q_OBJECT
-    Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface)
+    Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json")
+    Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface)
 public:
     void registerSensors()
     {
@@ -92,10 +93,7 @@ public:
 
         return 0;
     }
-    QStringList keys() const { return QStringList() << "generic";}
 };
 
-Q_EXPORT_PLUGIN2(qtsensors_generic, genericSensorPlugin)
-
 #include "main.moc"
 
diff --git a/src/plugins/sensors/generic/plugin.json b/src/plugins/sensors/generic/plugin.json
new file mode 100644
index 00000000..8a55b3ae
--- /dev/null
+++ b/src/plugins/sensors/generic/plugin.json
@@ -0,0 +1 @@
+{ "Keys": [ "notused" ] }