diff options
author | Luca Carlon <carlon.luca@gmail.com> | 2018-07-17 23:47:16 +0200 |
---|---|---|
committer | Luca Carlon <carlon.luca@gmail.com> | 2018-07-19 06:24:13 +0000 |
commit | 43b015e21d7d972ef4e9f5189fc2e840f648a492 (patch) | |
tree | b8d8669b22b2a1c87b708932db18c60c9b18f9a9 /src/location/declarativemaps | |
parent | f9079e89b25f9dd664a7791f5eb5f9a16a6a5e58 (diff) | |
download | qtlocation-43b015e21d7d972ef4e9f5189fc2e840f648a492.tar.gz |
Fix compilation when building with qreal defined as float
Call function templates with explicit type to force call using double
precision arguments even when qreal is defined as float.
Change-Id: Ida5004cdcba9b984a897e2eb7ae15044080d6adc
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/location/declarativemaps')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 09f9d01c..faa25916 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1039,9 +1039,9 @@ void QDeclarativeGeoMap::setMinimumTilt(qreal minimumTilt, bool userSet) m_userMinimumTilt = minimumTilt; qreal oldMinimumTilt = this->minimumTilt(); - m_minimumTilt = qBound(m_cameraCapabilities.minimumTilt(), - minimumTilt, - m_cameraCapabilities.maximumTilt()); + m_minimumTilt = qBound<double>(m_cameraCapabilities.minimumTilt(), + minimumTilt, + m_cameraCapabilities.maximumTilt()); if (tilt() < m_minimumTilt) setTilt(m_minimumTilt); @@ -1091,9 +1091,9 @@ void QDeclarativeGeoMap::setMinimumFieldOfView(qreal minimumFieldOfView, bool us m_userMinimumFieldOfView = minimumFieldOfView; qreal oldMinimumFoV = this->minimumFieldOfView(); - m_minimumFieldOfView = qBound(m_cameraCapabilities.minimumFieldOfView(), - minimumFieldOfView, - m_cameraCapabilities.maximumFieldOfView()); + m_minimumFieldOfView = qBound<double>(m_cameraCapabilities.minimumFieldOfView(), + minimumFieldOfView, + m_cameraCapabilities.maximumFieldOfView()); if (fieldOfView() < m_minimumFieldOfView) setFieldOfView(m_minimumFieldOfView); @@ -1128,9 +1128,9 @@ void QDeclarativeGeoMap::setMaximumFieldOfView(qreal maximumFieldOfView, bool us m_userMaximumFieldOfView = maximumFieldOfView; qreal oldMaximumFoV = this->maximumFieldOfView(); - m_maximumFieldOfView = qBound(m_cameraCapabilities.minimumFieldOfView(), - maximumFieldOfView, - m_cameraCapabilities.maximumFieldOfView()); + m_maximumFieldOfView = qBound<double>(m_cameraCapabilities.minimumFieldOfView(), + maximumFieldOfView, + m_cameraCapabilities.maximumFieldOfView()); if (fieldOfView() > m_maximumFieldOfView) setFieldOfView(m_maximumFieldOfView); @@ -1183,9 +1183,9 @@ void QDeclarativeGeoMap::setMaximumTilt(qreal maximumTilt, bool userSet) m_userMaximumTilt = maximumTilt; qreal oldMaximumTilt = this->maximumTilt(); - m_maximumTilt = qBound(m_cameraCapabilities.minimumTilt(), - maximumTilt, - m_cameraCapabilities.maximumTilt()); + m_maximumTilt = qBound<double>(m_cameraCapabilities.minimumTilt(), + maximumTilt, + m_cameraCapabilities.maximumTilt()); if (tilt() > m_maximumTilt) setTilt(m_maximumTilt); |