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, 11 insertions, 30 deletions

diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
index db5c381d..1f04424f 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
@@ -36,28 +36,7 @@
 
   See \l{Qt Quick 2 Scatter Example} for more thorough usage example.
 
-  \sa ItemModelScatterDataProxy, Bars3D, Surface3D, {Qt Data Visualization C++ Classes}
- */
-
-/*!
- * \qmlmethod void Scatter3D::setObjectColor(const QColor &baseColor, bool uniform)
- * Set item color using your own colors. \a baseColor sets the base color of a item. The \a uniform
- * -flag is used to define if color needs to be uniform throughout item's length, or will the colors
- * be applied by height. It is \c true by default.
- *
- * Calling this method overrides colors from theme.
- *
- * \sa AbstractGraph3D::theme
- *
- * \warning This method is subject to change.
- */
-
-/*!
-  \qmlproperty ScatterDataProxy Scatter3D::dataProxy
-  The active data proxy.
-
-  If a proxy is not given, a temporary default proxy is created and activated.
-  This temporary proxy is destroyed if another proxy is explicitly set active via this property.
+  \sa Scatter3DSeries, ScatterDataProxy, Bars3D, Surface3D, {Qt Data Visualization C++ Classes}
  */
 
 /*!
@@ -88,18 +67,20 @@
  */
 
 /*!
-  \qmlproperty Scatter3D.MeshStyle Scatter3D::objectType
-  Dot object type.
+ * \qmlproperty list<QScatter3DSeries> Scatter3D::seriesList
+ * This property holds the series of the graph.
+ * By default, this property contains an empty list.
+ * To set the series, either use the addSeries() function or define them as children of the graph.
  */
 
 /*!
-  \qmlproperty bool Scatter3D::objectSmoothingEnabled
-  Dot smoothing. If false, dot shading is flat.
+ * \qmlmethod void Scatter3D::addSeries(QScatter3DSeries *series)
+ * Adds the \a series to the graph. A graph can contain multiple series, but has only one set of
+ * axes. If the newly added series has specified a selected item, it will be highlighted and
+ * any existing selection will be cleared. Only one added series can have an active selection.
  */
 
 /*!
-  \qmlproperty string Scatter3D::meshFileName
-  Override object type with a mesh object.
-  \note Object needs to be in Wavefront obj format and include vertices, normals and UVs.
-  It also needs to be in triangles.
+ * \qmlmethod void Scatter3D::removeSeries(QScatter3DSeries *series)
+ * Remove the \a series from the graph.
  */