Merge branch 'develop' into mergebranch

Conflicts:
	examples/qmlbars/qml/qmlbars/main.qml
	examples/qmlscatter/qml/qmlscatter/main.qml
	examples/qmlsurface/qml/qmlsurface/main.qml
	src/datavisualization/data/qitemmodelbardatamapping.cpp
	src/datavisualization/data/qitemmodelscatterdatamapping.cpp
	src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
	src/datavisualization/engine/drawer.cpp

Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1

1 files changed, 6 insertions, 6 deletions

diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index 55ac0765..f7960b2b 100644
--- a/src/datavisualization/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -24,8 +24,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 AxisRenderCache::AxisRenderCache()
     : m_type(Q3DAbstractAxis::AxisTypeNone),
-      m_min(0.0),
-      m_max(10.0),
+      m_min(0.0f),
+      m_max(10.0f),
       m_segmentCount(5),
       m_subSegmentCount(1),
       m_font(QFont(QStringLiteral("Arial"))),
@@ -58,8 +58,8 @@ void AxisRenderCache::setType(Q3DAbstractAxis::AxisType type)
     // If type is set, it means completely new axis instance, so clear all old data
     m_labels.clear();
     m_title.clear();
-    m_min = 0.0;
-    m_max = 10.0;
+    m_min = 0.0f;
+    m_max = 10.0f;
     m_segmentCount = 5;
     m_subSegmentCount = 1;
     m_labelFormat.clear();
@@ -109,13 +109,13 @@ void AxisRenderCache::setLabels(const QStringList &labels)
     }
 }
 
-void AxisRenderCache::setMin(qreal min)
+void AxisRenderCache::setMin(float min)
 {
     m_min = min;
     updateSegmentStep();
 }
 
-void AxisRenderCache::setMax(qreal max)
+void AxisRenderCache::setMax(float max)
 {
     m_max = max;
     updateSegmentStep();