diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-14 16:33:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 08:02:30 +0100 |
| commit | 8d25a4a58c47431c589d8cbbc82e442360cf7e63 (patch) | |
| tree | 14d4c0f123e602e8528298346f72df5debd2936c /src/sensors/gestures/qsensorgestureplugininterface.h | |
| parent | b6d87d1b5141987452bc30e8b1d4115998ba6fd9 (diff) | |
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>
Diffstat (limited to 'src/sensors/gestures/qsensorgestureplugininterface.h')
| -rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 10 |
1 files changed, 2 insertions, 8 deletions
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 |