summaryrefslogtreecommitdiff
path: root/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h')
-rw-r--r--tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
index df729392..5f6f0116 100644
--- a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
@@ -62,11 +62,12 @@ public:
capabilities.setMaximumTilt(60);
setTileSize(QSize(256, 256));
+ const QByteArray pluginName = "qmlgeo.test.plugin";
QList<QGeoMapType> mapTypes;
- mapTypes << QGeoMapType(QGeoMapType::StreetMap, tr("StreetMap"), tr("StreetMap"), false, false, 1);
- mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("SatelliteMapDay"), tr("SatelliteMapDay"), false, false, 2);
- mapTypes << QGeoMapType(QGeoMapType::CycleMap, tr("CycleMap"), tr("CycleMap"), false, false, 3);
- mapTypes << QGeoMapType(QGeoMapType::CustomMap, tr("AlternateCameraCapabilities"), tr("AlternateCameraCapabilities"), false, false, 4);
+ mapTypes << QGeoMapType(QGeoMapType::StreetMap, tr("StreetMap"), tr("StreetMap"), false, false, 1, pluginName);
+ mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("SatelliteMapDay"), tr("SatelliteMapDay"), false, false, 2, pluginName);
+ mapTypes << QGeoMapType(QGeoMapType::CycleMap, tr("CycleMap"), tr("CycleMap"), false, false, 3, pluginName);
+ mapTypes << QGeoMapType(QGeoMapType::CustomMap, tr("AlternateCameraCapabilities"), tr("AlternateCameraCapabilities"), false, false, 4, pluginName);
setSupportedMapTypes(mapTypes);
QGeoTileFetcherTest *fetcher = new QGeoTileFetcherTest(this);
@@ -86,14 +87,14 @@ public:
setTileFetcher(fetcher);
}
- QGeoMap *createMap()
+ QGeoMap *createMap() override
{
return new QGeoTiledMapTest(this);
}
- QGeoCameraCapabilities cameraCapabilities(const QGeoMapType &mapType) const Q_DECL_OVERRIDE
+ QGeoCameraCapabilities cameraCapabilities(int mapId) const Q_DECL_OVERRIDE
{
- switch (mapType.mapId()) {
+ switch (mapId) {
case 4:
{
QGeoCameraCapabilities capabilities;
@@ -108,7 +109,7 @@ public:
return capabilities;
}
default:
- return QGeoMappingManagerEngine::cameraCapabilities(mapType);
+ return QGeoMappingManagerEngine::cameraCapabilities(mapId);
}
}