From 6d2f3b5f871426ebc68f487b1572e4c9eb9abb0e Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 23 Mar 2016 14:59:45 -0700 Subject: [PATCH] Fix qreal/double mingling Change-Id: I3ad1dc194ef1fcb836273a2f7e581109c80f11a0 --- src/imports/location/qdeclarativegeomap.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 591bcd7..dd4eebc 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -572,7 +572,7 @@ void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel) if (m_gestureArea && minimumZoomLevel >= 0) { qreal oldMinimumZoomLevel = this->minimumZoomLevel(); if (m_mappingManagerInitialized) { - minimumZoomLevel = qBound(m_map->minimumZoom(),minimumZoomLevel,m_mappingManager->cameraCapabilities().maximumZoomLevel()); + minimumZoomLevel = qBound(qreal(m_map->minimumZoom()),minimumZoomLevel,qreal(m_mappingManager->cameraCapabilities().maximumZoomLevel())); } m_gestureArea->setMinimumZoomLevel(minimumZoomLevel); @@ -619,7 +619,7 @@ void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel) if (m_gestureArea && maximumZoomLevel >= 0) { qreal oldMaximumZoomLevel = this->maximumZoomLevel(); if (m_mappingManagerInitialized) { - maximumZoomLevel = qBound(m_map->minimumZoom(),maximumZoomLevel,m_mappingManager->cameraCapabilities().maximumZoomLevel()); + maximumZoomLevel = qBound(qreal(m_map->minimumZoom()),maximumZoomLevel,qreal(m_mappingManager->cameraCapabilities().maximumZoomLevel())); } m_gestureArea->setMaximumZoomLevel(maximumZoomLevel); -- 2.7.4