diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2011-11-11 10:46:31 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 06:54:31 +0100 |
| commit | d95c5fee483816558246586c4621d96c84b224c0 (patch) | |
| tree | 6d458feddc453baf26ef85130f8447e8d0d2a6ab /src/plugins | |
| parent | 1f20d5ef3e27981e2af2c6533656694ea3335678 (diff) | |
remove qmobilitypluginsearch and use the QFactoryLoader instead.
Change-Id: Ifdd2031d309a5ac4cbeedc5d7cdb6ba9cbb845c3
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Sanity-Review: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 5 | ||||
| -rw-r--r-- | src/plugins/sensors/dummy/main.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/sensors/generic/main.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/sensors/simulator/main.cpp | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h index d11b9ee9..068656f2 100644 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -47,10 +47,11 @@ #include <qsensorgestureplugininterface.h> -class QShakeSensorGesturePlugin : public QObject, QSensorGesturePluginInterface +class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface) + Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) + public: explicit QShakeSensorGesturePlugin(); ~QShakeSensorGesturePlugin(); diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp index f7cf85f6..9b9bc237 100644 --- a/src/plugins/sensors/dummy/main.cpp +++ b/src/plugins/sensors/dummy/main.cpp @@ -50,7 +50,7 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface) + Q_INTERFACES(QSensorPluginInterface:QFactoryInterface) public: void registerSensors() { @@ -71,6 +71,7 @@ public: return 0; } + QStringList keys() const { return QStringList() << "dummy";} }; Q_EXPORT_PLUGIN2(qtsensors_dummy, dummySensorPlugin) diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp index 7714ce02..d72abdd3 100644 --- a/src/plugins/sensors/generic/main.cpp +++ b/src/plugins/sensors/generic/main.cpp @@ -51,7 +51,7 @@ class genericSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorChangesInterface, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) + Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface) public: void registerSensors() { @@ -92,6 +92,7 @@ public: return 0; } + QStringList keys() const { return QStringList() << "generic";} }; Q_EXPORT_PLUGIN2(qtsensors_generic, genericSensorPlugin) diff --git a/src/plugins/sensors/simulator/main.cpp b/src/plugins/sensors/simulator/main.cpp index 641f7a69..c470d12a 100644 --- a/src/plugins/sensors/simulator/main.cpp +++ b/src/plugins/sensors/simulator/main.cpp @@ -49,10 +49,10 @@ #include <QSensorBackend> #include <QSensorManager> -class SimulatorSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory +class SimulatorSensorPlugin : public QSensorPluginInterface,public QObject, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface) + Q_INTERFACES(QSensorPluginInterface:QFactoryInterface) public: void registerSensors() { @@ -92,6 +92,7 @@ public: return 0; } + QStringList keys() const { return QStringList() << "simulator";} }; Q_EXPORT_PLUGIN2(libsensors_simulator, SimulatorSensorPlugin) |