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>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
index 3108babc..cc5d1034 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QSensorGestureManagerPrivate::QSensorGestureManagerPrivate(QObject *parent) :
     QObject(parent)
 {
-    loader = new QFactoryLoader(QSensorGestureFactoryInterface_iid, QLatin1String("/sensorgestures"));
+    loader = new QFactoryLoader("com.Nokia.QSensorGesturePluginInterface", QLatin1String("/sensorgestures"));
     loadPlugins();
 }
 
@@ -92,12 +92,13 @@ QSensorGestureManagerPrivate::~QSensorGestureManagerPrivate()
   */
 void QSensorGestureManagerPrivate::loadPlugins()
 {
-    foreach (const QString &key, loader->keys()) {
-
-        QObject *plugin = loader->instance(key);
-        if (plugin) {
-            initPlugin(plugin);
-        }
+    Q_FOREACH (QObject *plugin, QPluginLoader::staticInstances()) {
+        initPlugin(plugin);
+    }
+    QList<QJsonObject> meta = loader->metaData();
+    for (int i = 0; i < meta.count(); i++) {
+        QObject *plugin = loader->instance(i);
+        initPlugin(plugin);
     }
 }