3 files changed, 11 insertions, 27 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);
     }
 }
 
diff --git a/src/sensors/gestures/qsensorgestureplugininterface.cpp b/src/sensors/gestures/qsensorgestureplugininterface.cpp
index ac28614b..90922c57 100644
--- a/src/sensors/gestures/qsensorgestureplugininterface.cpp
+++ b/src/sensors/gestures/qsensorgestureplugininterface.cpp
@@ -41,6 +41,7 @@
 
 #include "qsensorgestureplugininterface.h"
 
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QSensorGesturePluginInterface
@@ -81,8 +82,6 @@
   Returns this plugins name.
   */
 
-QT_BEGIN_NAMESPACE
-
 /*!
     Construct the QSensorGesturePluginInterface.
 */
@@ -95,16 +94,6 @@ QSensorGesturePluginInterface::QSensorGesturePluginInterface()
 */
 QSensorGesturePluginInterface::~QSensorGesturePluginInterface()
 {
-
-}
-
-/*!
-  \internal
-  Used by the factory loader.
-  */
-QStringList QSensorGesturePluginInterface::keys() const
-{
-    return QStringList() << name();
 }
 
 QT_END_NAMESPACE
diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h
index 1cc6c2e5..ea5bee9e 100644
--- a/src/sensors/gestures/qsensorgestureplugininterface.h
+++ b/src/sensors/gestures/qsensorgestureplugininterface.h
@@ -45,7 +45,6 @@
 #include <QObject>
 #include <QtGlobal>
 #include <QtCore/qplugin.h>
-#include <QtCore/qfactoryinterface.h>
 #include "qsensorgesture.h"
 #include "qsensorgesturerecognizer.h"
 
@@ -53,10 +52,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 class QSensorGestureRecognizer;
 
-#define QSensorGestureFactoryInterface_iid "com.Nokia.QSensorGesturePluginInterface"
-
-
-class Q_SENSORS_EXPORT QSensorGesturePluginInterface : public QFactoryInterface
+class Q_SENSORS_EXPORT QSensorGesturePluginInterface
 {
 public:
     QSensorGesturePluginInterface();
@@ -64,11 +60,9 @@ public:
     virtual QList <QSensorGestureRecognizer *> createRecognizers() = 0;
     virtual QStringList supportedIds() const = 0;
     virtual QString name() const = 0;
-private:
-    QStringList keys() const;
 };
 
-Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, QSensorGestureFactoryInterface_iid);
+Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "com.Nokia.QSensorGesturePluginInterface");
 
 QT_END_NAMESPACE
 QT_END_HEADER