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, 20 insertions, 13 deletions

diff --git a/src/datavisualization/axis/q3dabstractaxis.h b/src/datavisualization/axis/q3dabstractaxis.h
index 9e5c426a..825290f5 100644
--- a/src/datavisualization/axis/q3dabstractaxis.h
+++ b/src/datavisualization/axis/q3dabstractaxis.h
@@ -35,11 +35,11 @@ class QT_DATAVISUALIZATION_EXPORT Q3DAbstractAxis : public QObject
     Q_ENUMS(AxisOrientation)
     Q_ENUMS(AxisType)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
-    Q_PROPERTY(QStringList labels READ labels NOTIFY labelsChanged)
-    Q_PROPERTY(AxisOrientation orientation READ orientation)
-    Q_PROPERTY(AxisType type READ type)
-    Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY rangeChanged)
-    Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY rangeChanged)
+    Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged)
+    Q_PROPERTY(AxisOrientation orientation READ orientation NOTIFY orientationChanged)
+    Q_PROPERTY(AxisType type READ type CONSTANT)
+    Q_PROPERTY(float min READ min WRITE setMin NOTIFY minChanged)
+    Q_PROPERTY(float max READ max WRITE setMax NOTIFY maxChanged)
     Q_PROPERTY(bool autoAdjustRange READ isAutoAdjustRange WRITE setAutoAdjustRange NOTIFY autoAdjustRangeChanged)
 
 public:
@@ -63,26 +63,33 @@ protected:
 public:
     virtual ~Q3DAbstractAxis();
 
+    void setTitle(QString title);
     QString title() const;
+
+    void setLabels(const QStringList &labels);
     QStringList labels() const;
 
     AxisOrientation orientation() const;
     AxisType type() const;
 
-    qreal min() const;
-    qreal max() const;
-    bool isAutoAdjustRange() const;
+    void setMin(float min);
+    float min() const;
+
+    void setMax(float max);
+    float max() const;
 
-    void setTitle(QString title);
-    void setRange(qreal min, qreal max);
-    void setMin(qreal min);
-    void setMax(qreal max);
     void setAutoAdjustRange(bool autoAdjust);
+    bool isAutoAdjustRange() const;
+
+    void setRange(float min, float max);
 
 signals:
     void titleChanged(QString newTitle);
     void labelsChanged();
-    void rangeChanged(qreal min, qreal max);
+    void orientationChanged(AxisOrientation orientation);
+    void minChanged(float value);
+    void maxChanged(float value);
+    void rangeChanged(float min, float max);
     void autoAdjustRangeChanged(bool autoAdjust);
 
 protected: