diff options
author | Donald Carr <sirspudd@gmail.com> | 2016-03-23 14:25:31 -0700 |
---|---|---|
committer | Donald Carr <donald.carr@theqtcompany.com> | 2016-04-11 18:56:22 +0000 |
commit | bae9a0f52eb4c8faab2315dd45757c49544f682c (patch) | |
tree | bade2de583b454a854f8fbd728b60ddc129ae72c | |
parent | 4528d53b7429e48c51988002bf35e3615a152cb5 (diff) | |
download | qtlocation-5.7.0-beta1.tar.gz |
Remove inconsistent qreal/double co-mingling/comparisonv5.7.0-beta1
Fixes build breakage on machines where qreal = float (many ARM devices).
Avoid needless float to double conversion before assignment back to a
float.
Change-Id: Ia11c9dc912361f5aa05c4e01dec45c0d7b477609
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
-rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index b39f38c3..c72e5666 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -586,7 +586,7 @@ void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel) qreal oldMinimumZoomLevel = this->minimumZoomLevel(); if (m_map) { - minimumZoomLevel = qBound(m_map->cameraCapabilities().minimumZoomLevel(), minimumZoomLevel, maximumZoomLevel()); + minimumZoomLevel = qBound(qreal(m_map->cameraCapabilities().minimumZoomLevel()), minimumZoomLevel, maximumZoomLevel()); double minimumViewportZoomLevel = m_map->minimumZoomForMapSize(width(),height()); if (minimumZoomLevel < minimumViewportZoomLevel) minimumZoomLevel = minimumViewportZoomLevel; @@ -637,7 +637,7 @@ void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel) qreal oldMaximumZoomLevel = this->maximumZoomLevel(); if (m_map) - maximumZoomLevel = qBound(minimumZoomLevel(), double(maximumZoomLevel), m_map->cameraCapabilities().maximumZoomLevel()); + maximumZoomLevel = qBound(minimumZoomLevel(), maximumZoomLevel, qreal(m_map->cameraCapabilities().maximumZoomLevel())); m_gestureArea->setMaximumZoomLevel(maximumZoomLevel); |