diff options
| author | Vyacheslav Koscheev <vok1980@gmail.com> | 2016-10-27 11:34:24 +0700 |
|---|---|---|
| committer | Ola Røer Thorsen <ola@silentwings.no> | 2016-10-28 05:24:19 +0000 |
| commit | 3db74efd86aa0d724ca94bab5168aa9f92d3c18d (patch) | |
| tree | 90375e53f975467d8cc5a76fcb1446327aacafa2 /src | |
| parent | 8bc909704986209e98feae8057b0e3ce07a28cd8 (diff) | |
| download | qtlocation-3db74efd86aa0d724ca94bab5168aa9f92d3c18d.tar.gz | |
Compilation fix
minimumZoomLevel() returns qreal, qreal can be float
Task-number: QTBUG-56715
Change-Id: I7a5b5667b1c50518a216c401d97104b1909632df
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index ad2b78da..7e8e1728 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -889,7 +889,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(), m_map->mapController()->zoom() + double newZoom = qMax<double>(minimumZoomLevel(), m_map->mapController()->zoom() - zoomRatio); setZoomLevel(newZoom); m_validRegion = true; |