diff options
Diffstat (limited to 'tests')
6 files changed, 18 insertions, 4 deletions
diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp index d6fe0c0c..36b1688b 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp @@ -59,6 +59,11 @@ QString QGeoServiceProviderFactoryTest::providerName() const return "qmlgeo.test.plugin"; } +QStringList QGeoServiceProviderFactoryTest::keys() const +{ + return QStringList() << QLatin1String("qmlgeo.test.plugin"); +} + int QGeoServiceProviderFactoryTest::providerVersion() const { return 3; diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index a8b567a6..b2b5f357 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -50,13 +50,14 @@ QT_USE_NAMESPACE class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactory { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactory:QFactoryInterface) public: QGeoServiceProviderFactoryTest(); ~QGeoServiceProviderFactoryTest(); QString providerName() const; int providerVersion() const; + QStringList keys() const; QGeoMappingManagerEngine* createMappingManagerEngine ( diff --git a/tests/auto/positionplugin/plugin.cpp b/tests/auto/positionplugin/plugin.cpp index abd51e02..5307c141 100644 --- a/tests/auto/positionplugin/plugin.cpp +++ b/tests/auto/positionplugin/plugin.cpp @@ -176,12 +176,14 @@ void DummySource::doTimeout() class QGeoPositionInfoSourceFactoryTest : public QObject, public QGeoPositionInfoSourceFactory { Q_OBJECT - Q_INTERFACES(QGeoPositionInfoSourceFactory) + Q_INTERFACES(QGeoPositionInfoSourceFactory:QFactoryInterface) public: QString sourceName() const; int sourceVersion() const; + QStringList keys() const { return QStringList() << QLatin1String("testposition.source"); } + QGeoPositionInfoSource *positionInfoSource(QObject *parent); QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent); }; diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp index cf837d10..bd69f373 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp @@ -57,6 +57,11 @@ QString QGeoServiceProviderFactoryTest::providerName() const return "static.geocode.test.plugin"; } +QStringList QGeoServiceProviderFactoryTest::keys() const +{ + return QStringList() << QLatin1String("static.geocode.test.plugin"); +} + int QGeoServiceProviderFactoryTest::providerVersion() const { return 3; diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h index 281942da..9a0acf82 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h @@ -50,13 +50,14 @@ QT_USE_NAMESPACE class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactory { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactory:QFactoryInterface) public: QGeoServiceProviderFactoryTest(); ~QGeoServiceProviderFactoryTest(); QString providerName() const; int providerVersion() const; + QStringList keys() const; QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; diff --git a/tests/plugins/declarativetestplugin/declarativetestplugin.pro b/tests/plugins/declarativetestplugin/declarativetestplugin.pro index 34372513..f5986904 100644 --- a/tests/plugins/declarativetestplugin/declarativetestplugin.pro +++ b/tests/plugins/declarativetestplugin/declarativetestplugin.pro @@ -22,7 +22,7 @@ SOURCES += locationtest.cpp \ ../../../src/imports/location/qdeclarativecoordinate.cpp # Tell qmake to create such makefile that qmldir and target (i.e. declarative_location) -# are both copied to qt/imports/QtMobility/location -directory, +# are both copied to qt/imports/QtLocation -directory, # as the "/imports" is the default place where qmlviewer looks for plugins # (otherwise qmlviewer -I <path> -option is needed) |