summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2017-03-30 17:25:43 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-03-31 08:32:49 +0000
commit6bc54fc4b531e9cfeaa04296b4986ffb0f82dd3d (patch)
treeb181bc57bee176b807e8870acbecf5532a6affe4
parent20a7d7b265742c3eea8d080e6710bf7bd2cb5bdd (diff)
Fix for camera data not updated in changeActiveMapTypev5.9.0-beta1
This patch forces a camera data update upon changeActiveMapType, which may change the tile size. Change-Id: Ib371ea7f76267bc4ed8a30eed31ec3887b4a1415 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/maps/qgeotiledmap.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index 85931efd..dbfe45ea 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -340,7 +340,8 @@ void QGeoTiledMapPrivate::changeActiveMapType(const QGeoMapType mapType)
m_mapScene->setTileSize(m_cameraCapabilities.tileSize());
m_visibleTiles->setMapType(mapType);
m_prefetchTiles->setMapType(mapType);
- updateScene();
+ changeCameraData(m_cameraData); // Updates the zoom level to the possibly new tile size
+ // updateScene called in changeCameraData()
}
void QGeoTiledMapPrivate::changeTileVersion(int version)