diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 10:53:45 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 10:53:56 +0100 |
| commit | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (patch) | |
| tree | 40e88861e7987c5286012185303205113aa4ca3c /src/imports | |
| parent | 3f813d1c8c24e5da67d3f096eb3f5c73e760e641 (diff) | |
| parent | 09868ace97177fbeb7198a844113f47065102b1b (diff) | |
| download | qtlocation-16423f84f970d7dac644a4b041e3ebe2ac0f6e22.tar.gz | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/maps.pri
Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index fd98b2ca..53d607fb 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -969,8 +969,7 @@ void QDeclarativeGeoMap::fitViewportToGeoShape() bboxHeight / (height() - margins)); // fixme: use log2 with c++11 zoomRatio = std::log(zoomRatio) / std::log(2.0); - double newZoom = qMax(minimumZoomLevel(), zoomLevel() - - zoomRatio); + double newZoom = qMax<double>(minimumZoomLevel(), zoomLevel() - zoomRatio); setZoomLevel(newZoom); m_validRegion = true; } |