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 /tests/auto | |
| 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 'tests/auto')
5 files changed, 15 insertions, 7 deletions
diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index c501377a..c850b676 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -54,7 +54,7 @@ class TestSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) + Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface) public: void registerSensors() { @@ -63,6 +63,7 @@ public: if (recursive) return; recursive = true; + // This is bad code. It caused a crash due to recursively calling // loadPlugins() in qsensormanager.cpp (because loadPlugins() did // not set the pluginsLoaded flag soon enough). @@ -103,6 +104,8 @@ public: qWarning() << "Can't create backend" << sensor->identifier(); return 0; } + QStringList keys() const { return QStringList() << "test";} + }; REGISTER_STATIC_PLUGIN_V2(TestSensorPlugin) @@ -114,6 +117,8 @@ public: { qWarning() << "Loaded the LegacySensorPlugin"; } + QStringList keys() const { return QStringList() << "legacy";} + }; REGISTER_STATIC_PLUGIN_V1(LegacySensorPlugin) diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h index a87f6a0c..d37abd1d 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h +++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h @@ -45,10 +45,11 @@ #include <QObject> #include <qsensorgestureplugininterface.h> -class QTestSensorGesturePlugin : public QObject, QSensorGesturePluginInterface +class QTestSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface) + Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) + public: explicit QTestSensorGesturePlugin(); ~QTestSensorGesturePlugin(); diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h index b6c083bf..de96a222 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h +++ b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h @@ -48,7 +48,8 @@ class QTestSensorGestureDupPlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface) + Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) + public: explicit QTestSensorGestureDupPlugin(); ~QTestSensorGestureDupPlugin(); diff --git a/tests/auto/sensors2qmlapi/qbackends.h b/tests/auto/sensors2qmlapi/qbackends.h index 01bfa36a..de1c5c02 100644 --- a/tests/auto/sensors2qmlapi/qbackends.h +++ b/tests/auto/sensors2qmlapi/qbackends.h @@ -55,7 +55,7 @@ class TestSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) + Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface) public: void registerSensors() { @@ -95,6 +95,7 @@ public: qWarning() << "Can't create backend" << sensor->identifier(); return 0; } + QStringList keys() const { return QStringList() << "test";} public: static QDeclAccelerometer* stAccel; static QDeclAmbientLightSensor* stAbl; diff --git a/tests/auto/sensors2qmlapi/qtemplategestureplugin.h b/tests/auto/sensors2qmlapi/qtemplategestureplugin.h index 04e2662e..cf41e9c6 100644 --- a/tests/auto/sensors2qmlapi/qtemplategestureplugin.h +++ b/tests/auto/sensors2qmlapi/qtemplategestureplugin.h @@ -47,10 +47,10 @@ #include <qsensorgestureplugininterface.h> -class QTemplateGesturePlugin : public QObject, QSensorGesturePluginInterface +class QTemplateGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface) + Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) public: explicit QTemplateGesturePlugin(); ~QTemplateGesturePlugin(); |