diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-16 14:01:32 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-16 14:04:06 +0300 |
| commit | 575666763aa224dd20d7680d6f9739bdec6cb9cc (patch) | |
| tree | 8d8ac6620b5b75131ed4ffee6e2cb00d1ba96785 /src/datavisualization | |
| parent | d1807d099e1852e902770345c6a14912b4f2d175 (diff) | |
Android compilation error fixes
Change-Id: I27495e030370acdd8bb3a0c128b350228260b30d
Change-Id: I27495e030370acdd8bb3a0c128b350228260b30d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization')
| -rw-r--r-- | src/datavisualization/engine/q3dcamera.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 571af1d7..8b9bcaa7 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -167,7 +167,7 @@ qreal Q3DCamera::minXRotation() const */ void Q3DCamera::setMinXRotation(qreal minRotation) { - minRotation = qBound(-180.0, minRotation, 180.0); + minRotation = qBound(qreal(-180.0), minRotation, qreal(180.0)); if (minRotation > d_ptr->m_maxXRotation) minRotation = d_ptr->m_maxXRotation; @@ -199,7 +199,7 @@ qreal Q3DCamera::minYRotation() const */ void Q3DCamera::setMinYRotation(qreal minRotation) { - minRotation = qBound(-90.0, minRotation, 90.0); + minRotation = qBound(qreal(-90.0), minRotation, qreal(90.0)); if (minRotation > d_ptr->m_maxYRotation) minRotation = d_ptr->m_maxYRotation; @@ -231,7 +231,7 @@ qreal Q3DCamera::maxXRotation() const */ void Q3DCamera::setMaxXRotation(qreal maxRotation) { - maxRotation = qBound(-180.0, maxRotation, 180.0); + maxRotation = qBound(qreal(-180.0), maxRotation, qreal(180.0)); if (maxRotation < d_ptr->m_minXRotation) maxRotation = d_ptr->m_minXRotation; @@ -264,7 +264,7 @@ qreal Q3DCamera::maxYRotation() const */ void Q3DCamera::setMaxYRotation(qreal maxRotation) { - maxRotation = qBound(-90.0, maxRotation, 90.0); + maxRotation = qBound(qreal(-90.0), maxRotation, qreal(90.0)); if (maxRotation < d_ptr->m_minYRotation) maxRotation = d_ptr->m_minYRotation; @@ -582,7 +582,7 @@ void Q3DCamera::setWrapYRotation(bool isEnabled) */ void Q3DCamera::setCameraPosition(qreal horizontal, qreal vertical, qreal zoom) { - setZoomLevel(qBound(10.0, zoom, 500.0)); + setZoomLevel(qBound(qreal(10.0), zoom, qreal(500.0))); setXRotation(horizontal); setYRotation(vertical); } |