summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 09:53:55 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 09:54:08 +0200
commit19642842cea91a4588828362eba023c5da5ab57b (patch)
tree10366b074ae32e280300eb5f6fbcd5111ad4c82b /src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
parent1a1d2e3fff5856dc9d1283b510a9f325c6fb8a93 (diff)
parente7099f14c8faea4fb7c89877973b7cec75044cb3 (diff)
downloadqtlocation-19642842cea91a4588828362eba023c5da5ab57b.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I4f29307985225a723304783e00a6844a1b9ee825
Diffstat (limited to 'src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h')
-rw-r--r--src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
index 2ceebc74..247e4377 100644
--- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.h
@@ -63,6 +63,13 @@ public:
const QVector<QGeoTileProviderOsm *> &providers();
QString customCopyright() const;
+protected Q_SLOTS:
+ void onProviderResolutionFinished(const QGeoTileProviderOsm *provider);
+ void onProviderResolutionError(const QGeoTileProviderOsm *provider, QNetworkReply::NetworkError error);
+
+protected:
+ void updateMapTypes();
+
private:
QVector<QGeoTileProviderOsm *> m_providers;
QString m_customCopyright;