Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf
	src/charts/barchart/qbarset.cpp

Change-Id: Id57f9d6ac8cdf996a6bc77780e4a3ee97cae66d6

1 files changed, 6 insertions, 4 deletions

diff --git a/src/chartsqml2/declarativexypoint.cpp b/src/chartsqml2/declarativexypoint.cpp
index 91f4eae5..91ade7c2 100644
--- a/src/chartsqml2/declarativexypoint.cpp
+++ b/src/chartsqml2/declarativexypoint.cpp
@@ -36,11 +36,13 @@ QT_CHARTS_BEGIN_NAMESPACE
     \qmltype XYPoint
     \inqmlmodule QtCharts
 
-    \brief Type is used to initialize XY-series coordinate data.
+    \brief Initializes XY-series coordinate data.
 
-    XYPoint is a convenience element for initializing XY-series with static coordinate data. To
-    manipulate an XY-series dynamically, use it's data manipulation functions instead.
-    \sa LineSeries, AreaSeries, ScatterSeries, SplineSeries
+    The XYPoint type is a convenience type for initializing line, spline, and
+    scatter series with static coordinate data. To manipulate a series
+    dynamically, use the data manipulation functions it inherits from the
+    XYSeries type, instead.
+    \sa XYSeries, LineSeries, AreaSeries, ScatterSeries, SplineSeries
 */
 
 /*!