diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-09 16:16:53 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-10 08:34:39 +0000 |
| commit | dba8ff01b82aa8eb0ca2292592f55665b90c3507 (patch) | |
| tree | dfc7275d039e2259b4308fcede0e703f3cd63db1 /src/location/declarativemaps/qdeclarativegeomap.cpp | |
| parent | 751294f3003395c8e14246d004e5a58d96a93473 (diff) | |
| download | qtlocation-dba8ff01b82aa8eb0ca2292592f55665b90c3507.tar.gz | |
Use cameraCapabilities from QGeoMap
This patch makes the access to cameraCapabilities consistent throughout
qdeclarativegeomap.cpp, whereas previously this was sometimes accessed
through the mappingManager.
Change-Id: I6948f4c376530162a872798b5df848c48237c4c6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index b7ec31ca..20e61ed3 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -655,11 +655,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized() //strict zoom level limit before initialization nothing is done here. //minimum zoom level might be changed to limit gray bundaries //This code assumes that plugins' maximum zoom level will never exceed 30.0 - if (m_mappingManager->cameraCapabilities().maximumZoomLevelAt256() < m_gestureArea->maximumZoomLevel()) - setMaximumZoomLevel(m_mappingManager->cameraCapabilities().maximumZoomLevelAt256()); + if (m_map->cameraCapabilities().maximumZoomLevelAt256() < m_gestureArea->maximumZoomLevel()) + setMaximumZoomLevel(m_map->cameraCapabilities().maximumZoomLevelAt256()); - if (m_mappingManager->cameraCapabilities().minimumZoomLevelAt256() > m_gestureArea->minimumZoomLevel()) - setMinimumZoomLevel(m_mappingManager->cameraCapabilities().minimumZoomLevelAt256()); + if (m_map->cameraCapabilities().minimumZoomLevelAt256() > m_gestureArea->minimumZoomLevel()) + setMinimumZoomLevel(m_map->cameraCapabilities().minimumZoomLevelAt256()); // Map tiles are built in this call. m_map->minimumZoom() becomes operational |