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_p.h b/src/datavisualization/engine/axisrendercache_p.h
index 0bb1cf92..cddc7839 100644
--- a/src/datavisualization/engine/axisrendercache_p.h
+++ b/src/datavisualization/engine/axisrendercache_p.h
@@ -51,10 +51,10 @@ public:
     inline const QString &title() { return m_title; }
     void setLabels(const QStringList &labels);
     inline const QStringList &labels() { return m_labels; }
-    void setMin(qreal min);
-    inline qreal min() { return m_min; }
-    void setMax(qreal max);
-    inline qreal max() { return m_max; }
+    void setMin(float min);
+    inline float min() { return m_min; }
+    void setMax(float max);
+    inline float max() { return m_max; }
     void setSegmentCount(int count);
     inline int segmentCount() const { return m_segmentCount; }
     void setSubSegmentCount(int count);
@@ -79,8 +79,8 @@ private:
     Q3DAbstractAxis::AxisType m_type;
     QString m_title;
     QStringList m_labels;
-    qreal m_min;
-    qreal m_max;
+    float m_min;
+    float m_max;
     int m_segmentCount;
     int m_subSegmentCount;
     QString m_labelFormat;