diff options
Diffstat (limited to 'tests/auto')
7 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index 08d6cd3e..6d78e905 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -54,7 +54,8 @@ class TestSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface) + //Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: void registerSensors() { @@ -104,8 +105,6 @@ public: qWarning() << "Can't create backend" << sensor->identifier(); return 0; } - QStringList keys() const { return QStringList() << "test";} - }; // Logic stolen from qplugin.h diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h index bb1fd454..cf1ab32e 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h +++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h @@ -48,7 +48,8 @@ class QTestSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) + //Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") + Q_INTERFACES(QSensorGesturePluginInterface) public: explicit QTestSensorGesturePlugin(); diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h index 1ab5e44e..18f4577a 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:QFactoryInterface) + //Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") + Q_INTERFACES(QSensorGesturePluginInterface) public: explicit QTestSensorGestureDupPlugin(); diff --git a/tests/auto/sensors2qmlapi/qbackends.h b/tests/auto/sensors2qmlapi/qbackends.h index 90cc2562..368de18a 100644 --- a/tests/auto/sensors2qmlapi/qbackends.h +++ b/tests/auto/sensors2qmlapi/qbackends.h @@ -55,7 +55,8 @@ class TestSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface) + //Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: void registerSensors() { @@ -95,7 +96,6 @@ 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.cpp b/tests/auto/sensors2qmlapi/qtemplategestureplugin.cpp index 27a49dde..ab0a9087 100644 --- a/tests/auto/sensors2qmlapi/qtemplategestureplugin.cpp +++ b/tests/auto/sensors2qmlapi/qtemplategestureplugin.cpp @@ -76,6 +76,3 @@ QList <QSensorGestureRecognizer *> QTemplateGesturePlugin::createRecognizers() return recognizers; } - -Q_EXPORT_PLUGIN2(QTemplateGestureRecognizer, QTemplateGesturePlugin) - diff --git a/tests/auto/sensors2qmlapi/qtemplategestureplugin.h b/tests/auto/sensors2qmlapi/qtemplategestureplugin.h index f396ce09..cef952bb 100644 --- a/tests/auto/sensors2qmlapi/qtemplategestureplugin.h +++ b/tests/auto/sensors2qmlapi/qtemplategestureplugin.h @@ -50,7 +50,8 @@ class QTemplateGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) + //Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") + Q_INTERFACES(QSensorGesturePluginInterface) public: explicit QTemplateGesturePlugin(); ~QTemplateGesturePlugin(); diff --git a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro index 28043601..81446925 100644 --- a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro +++ b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro @@ -26,3 +26,4 @@ HEADERS += qdeclaccelerometer.h \ ./../../../src/imports/sensors2/qsensor2common.h \ qtemplategestureplugin.h \ qtemplaterecognizer.h + |