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/qsensorplugin.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/qsensorplugin.h')
| -rw-r--r-- | src/sensors/qsensorplugin.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index 2a23c72d..0d2cbd01 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -44,22 +44,15 @@ #include <QtSensors/qsensorsglobal.h> -#include <QtCore/qstringlist.h> #include <QtCore/qplugin.h> -#include <QtCore/qfactoryinterface.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#define QSensorPluginInterface_iid "com.nokia.Qt.QSensorPluginInterface/1.0" - -class Q_SENSORS_EXPORT QSensorPluginInterface : public QFactoryInterface +class Q_SENSORS_EXPORT QSensorPluginInterface { - public: virtual void registerSensors() = 0; - virtual QStringList keys() const = 0; - protected: ~QSensorPluginInterface() {} }; @@ -72,8 +65,8 @@ protected: ~QSensorChangesInterface() {} }; -Q_DECLARE_INTERFACE(QSensorPluginInterface, QSensorPluginInterface_iid); -Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/1.0"); +Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface/1.0"); +Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/5.0"); QT_END_NAMESPACE QT_END_HEADER |