From 3db74efd86aa0d724ca94bab5168aa9f92d3c18d Mon Sep 17 00:00:00 2001
From: Vyacheslav Koscheev <vok1980@gmail.com>
Date: Thu, 27 Oct 2016 11:34:24 +0700
Subject: Compilation fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/imports/location/qdeclarativegeomap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/imports')

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;
-- 
cgit v1.2.1