Fully qualify classes in QtCharts namespace in Q_PROPERTY

qmlplugindump otherwise cannot make the connection between the
type of the property and the QMetaObject. This fixes an issue where
Qt Creator was not handling some properties for the QML types
properly.

Ideally we also would do this for arguments in signals, slots,
Q_INVOKABLES. Anyhow, this can be an incompatible change (e.g.
if you use string-based connect).

Fixes: QTBUG-51704
Change-Id: I3a3b5fc7f7539ff15974be9c2e268df7e1ad7f30
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

21 files changed, 152 insertions, 152 deletions

diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h
index cd6e58b4..2b84b8d5 100644
--- a/src/charts/areachart/qareaseries.h
+++ b/src/charts/areachart/qareaseries.h
@@ -42,8 +42,8 @@ class QAreaSeriesPrivate;
 class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries
 {
     Q_OBJECT
-    Q_PROPERTY(QLineSeries *upperSeries READ upperSeries)
-    Q_PROPERTY(QLineSeries *lowerSeries READ lowerSeries)
+    Q_PROPERTY(QtCharts::QLineSeries *upperSeries READ upperSeries)
+    Q_PROPERTY(QtCharts::QLineSeries *lowerSeries READ lowerSeries)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
     Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
     Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged)
diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h
index 23fe8e4f..7639ed6b 100644
--- a/src/charts/barchart/qhbarmodelmapper.h
+++ b/src/charts/barchart/qhbarmodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow NOTIFY firstBarSetRowChanged)
     Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow NOTIFY lastBarSetRowChanged)
diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h
index 84c7a6ea..b859a76a 100644
--- a/src/charts/barchart/qvbarmodelmapper.h
+++ b/src/charts/barchart/qvbarmodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn NOTIFY firstBarSetColumnChanged)
     Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn NOTIFY lastBarSetColumnChanged)
diff --git a/src/charts/boxplotchart/qhboxplotmodelmapper.h b/src/charts/boxplotchart/qhboxplotmodelmapper.h
index 374ad78a..8ed690dd 100644
--- a/src/charts/boxplotchart/qhboxplotmodelmapper.h
+++ b/src/charts/boxplotchart/qhboxplotmodelmapper.h
@@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QHBoxPlotModelMapper : public QBoxPlotModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int firstBoxSetRow READ firstBoxSetRow WRITE setFirstBoxSetRow NOTIFY firstBoxSetRowChanged)
     Q_PROPERTY(int lastBoxSetRow READ lastBoxSetRow WRITE setLastBoxSetRow NOTIFY lastBoxSetRowChanged)
diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.h b/src/charts/boxplotchart/qvboxplotmodelmapper.h
index 1f85c903..b6d9b391 100644
--- a/src/charts/boxplotchart/qvboxplotmodelmapper.h
+++ b/src/charts/boxplotchart/qvboxplotmodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int firstBoxSetColumn READ firstBoxSetColumn WRITE setFirstBoxSetColumn NOTIFY firstBoxSetColumnChanged)
     Q_PROPERTY(int lastBoxSetColumn READ lastBoxSetColumn WRITE setLastBoxSetColumn NOTIFY lastBoxSetColumnChanged)
diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.h b/src/charts/candlestickchart/qcandlestickmodelmapper.h
index 532c2f97..1103da85 100644
--- a/src/charts/candlestickchart/qcandlestickmodelmapper.h
+++ b/src/charts/candlestickchart/qcandlestickmodelmapper.h
@@ -46,7 +46,7 @@ class QT_CHARTS_EXPORT QCandlestickModelMapper : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
-    Q_PROPERTY(QCandlestickSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QCandlestickSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
 
 public:
     explicit QCandlestickModelMapper(QObject *parent = nullptr);
diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h
index 1ae65f0e..a3db411f 100644
--- a/src/charts/legend/qlegendmarker.h
+++ b/src/charts/legend/qlegendmarker.h
@@ -63,7 +63,7 @@ public:
     Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
     Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-    Q_PROPERTY(QLegend::MarkerShape shape READ shape WRITE setShape NOTIFY shapeChanged)
+    Q_PROPERTY(QtCharts::QLegend::MarkerShape shape READ shape WRITE setShape NOTIFY shapeChanged)
     Q_ENUMS(LegendMarkerType)
 
 public:
diff --git a/src/charts/piechart/qhpiemodelmapper.h b/src/charts/piechart/qhpiemodelmapper.h
index 8698b35e..aa25b9e6 100644
--- a/src/charts/piechart/qhpiemodelmapper.h
+++ b/src/charts/piechart/qhpiemodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int valuesRow READ valuesRow WRITE setValuesRow NOTIFY valuesRowChanged)
     Q_PROPERTY(int labelsRow READ labelsRow WRITE setLabelsRow NOTIFY labelsRowChanged)
diff --git a/src/charts/piechart/qvpiemodelmapper.h b/src/charts/piechart/qvpiemodelmapper.h
index 1f2b7b50..2a7a5b2b 100644
--- a/src/charts/piechart/qvpiemodelmapper.h
+++ b/src/charts/piechart/qvpiemodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int valuesColumn READ valuesColumn WRITE setValuesColumn NOTIFY valuesColumnChanged)
     Q_PROPERTY(int labelsColumn READ labelsColumn WRITE setLabelsColumn NOTIFY labelsColumnChanged)
diff --git a/src/charts/xychart/qhxymodelmapper.h b/src/charts/xychart/qhxymodelmapper.h
index c540e69b..15d80dfd 100644
--- a/src/charts/xychart/qhxymodelmapper.h
+++ b/src/charts/xychart/qhxymodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int xRow READ xRow WRITE setXRow NOTIFY xRowChanged)
     Q_PROPERTY(int yRow READ yRow WRITE setYRow NOTIFY yRowChanged)
diff --git a/src/charts/xychart/qvxymodelmapper.h b/src/charts/xychart/qvxymodelmapper.h
index 0ab9ea4d..277cae00 100644
--- a/src/charts/xychart/qvxymodelmapper.h
+++ b/src/charts/xychart/qvxymodelmapper.h
@@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper
 {
     Q_OBJECT
-    Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
+    Q_PROPERTY(QtCharts::QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
     Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn NOTIFY xColumnChanged)
     Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn NOTIFY yColumnChanged)
diff --git a/src/chartsqml2/declarativeareaseries_p.h b/src/chartsqml2/declarativeareaseries_p.h
index b2c884be..cc8b7421 100644
--- a/src/chartsqml2/declarativeareaseries_p.h
+++ b/src/chartsqml2/declarativeareaseries_p.h
@@ -49,14 +49,14 @@ class DeclarativeLineSeries;
 class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries
 {
     Q_OBJECT
-    Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
-    Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
-    Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
+    Q_PROPERTY(QtCharts::DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
+    Q_PROPERTY(QtCharts::DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
     Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
     Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4)
     Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4)
diff --git a/src/chartsqml2/declarativeaxes_p.h b/src/chartsqml2/declarativeaxes_p.h
index af5b13c2..fa328db8 100644
--- a/src/chartsqml2/declarativeaxes_p.h
+++ b/src/chartsqml2/declarativeaxes_p.h
@@ -50,10 +50,10 @@ class QAbstractAxis;
 class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
 
 public:
     explicit DeclarativeAxes(QObject *parent = 0);
diff --git a/src/chartsqml2/declarativebarseries_p.h b/src/chartsqml2/declarativebarseries_p.h
index a419fb04..bba71dfa 100644
--- a/src/chartsqml2/declarativebarseries_p.h
+++ b/src/chartsqml2/declarativebarseries_p.h
@@ -97,10 +97,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, publ
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
@@ -144,10 +144,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedB
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
@@ -191,10 +191,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentB
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
@@ -238,10 +238,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHoriz
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
@@ -285,10 +285,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
@@ -332,10 +332,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
 
diff --git a/src/chartsqml2/declarativeboxplotseries_p.h b/src/chartsqml2/declarativeboxplotseries_p.h
index e035f8e2..19d549af 100644
--- a/src/chartsqml2/declarativeboxplotseries_p.h
+++ b/src/chartsqml2/declarativeboxplotseries_p.h
@@ -97,10 +97,10 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeri
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 1)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
diff --git a/src/chartsqml2/declarativecandlestickseries_p.h b/src/chartsqml2/declarativecandlestickseries_p.h
index 96787de2..5ed0989c 100644
--- a/src/chartsqml2/declarativecandlestickseries_p.h
+++ b/src/chartsqml2/declarativecandlestickseries_p.h
@@ -75,10 +75,10 @@ class DeclarativeCandlestickSeries : public QCandlestickSeries, public QQmlParse
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
     Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged)
     Q_CLASSINFO("DefaultProperty", "seriesChildren")
diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h
index 1d8e6d31..dd619214 100644
--- a/src/chartsqml2/declarativechart_p.h
+++ b/src/chartsqml2/declarativechart_p.h
@@ -67,12 +67,12 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeChart : public QQuickItem
     Q_PROPERTY(QString title READ title WRITE setTitle)
     Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
     Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
-    Q_PROPERTY(QLegend *legend READ legend CONSTANT)
+    Q_PROPERTY(QtCharts::QLegend *legend READ legend CONSTANT)
     Q_PROPERTY(int count READ count)
     Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
     Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
     Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness NOTIFY backgroundRoundnessChanged REVISION 3)
-    Q_PROPERTY(DeclarativeMargins *margins READ margins NOTIFY marginsChanged REVISION 2)
+    Q_PROPERTY(QtCharts::DeclarativeMargins *margins READ margins NOTIFY marginsChanged REVISION 2)
     Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1)
     Q_PROPERTY(QColor plotAreaColor READ plotAreaColor WRITE setPlotAreaColor NOTIFY plotAreaColorChanged REVISION 3)
     Q_PROPERTY(QQmlListProperty<QAbstractAxis> axes READ axes REVISION 2)
diff --git a/src/chartsqml2/declarativelineseries_p.h b/src/chartsqml2/declarativelineseries_p.h
index e3fcc14a..70de3d05 100644
--- a/src/chartsqml2/declarativelineseries_p.h
+++ b/src/chartsqml2/declarativelineseries_p.h
@@ -54,12 +54,12 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, pu
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
-    Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
     Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
     Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
     Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
diff --git a/src/chartsqml2/declarativescatterseries_p.h b/src/chartsqml2/declarativescatterseries_p.h
index c02ed47e..e01ddb46 100644
--- a/src/chartsqml2/declarativescatterseries_p.h
+++ b/src/chartsqml2/declarativescatterseries_p.h
@@ -54,12 +54,12 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeri
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
-    Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
     Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
     Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)
     Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4)
diff --git a/src/chartsqml2/declarativesplineseries_p.h b/src/chartsqml2/declarativesplineseries_p.h
index d6369a87..c6e6689e 100644
--- a/src/chartsqml2/declarativesplineseries_p.h
+++ b/src/chartsqml2/declarativesplineseries_p.h
@@ -54,12 +54,12 @@ class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
-    Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
-    Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
-    Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
+    Q_PROPERTY(QtCharts::QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
     Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
     Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
     Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
diff --git a/src/chartsqml2/plugins.qmltypes b/src/chartsqml2/plugins.qmltypes
index 334c4f13..18a1ae2d 100644
--- a/src/chartsqml2/plugins.qmltypes
+++ b/src/chartsqml2/plugins.qmltypes
@@ -64,14 +64,14 @@ Module {
             "QtCharts/AreaSeries 2.0"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 3, 4, 4]
-        Property { name: "upperSeries"; type: "DeclarativeLineSeries"; isPointer: true }
-        Property { name: "lowerSeries"; type: "DeclarativeLineSeries"; isPointer: true }
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "upperSeries"; type: "QtCharts::DeclarativeLineSeries"; isPointer: true }
+        Property { name: "lowerSeries"; type: "QtCharts::DeclarativeLineSeries"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "borderWidth"; revision: 1; type: "double" }
         Property { name: "brushFilename"; revision: 4; type: "string" }
         Property { name: "brush"; revision: 4; type: "QBrush" }
@@ -126,10 +126,10 @@ Module {
         ]
         isCreatable: false
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Signal {
             name: "axisXChanged"
             Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
@@ -158,10 +158,10 @@ Module {
             "QtCharts/BarSeries 2.0"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 2]
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
             name: "axisXChanged"
@@ -275,10 +275,10 @@ Module {
             "QtCharts/BoxPlotSeries 2.0"
         ]
         exportMetaObjectRevisions: [0, 1, 1]
-        Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "brushFilename"; revision: 1; type: "string" }
         Signal {
@@ -433,10 +433,10 @@ Module {
         prototype: "QtCharts::QCandlestickSeries"
         exports: ["QtCharts/CandlestickSeries 2.2"]
         exportMetaObjectRevisions: [0]
-        Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "brushFilename"; type: "string" }
         Signal {
@@ -666,7 +666,7 @@ Module {
         Property { name: "title"; type: "string" }
         Property { name: "titleFont"; type: "QFont" }
         Property { name: "titleColor"; type: "QColor" }
-        Property { name: "legend"; type: "QLegend"; isReadonly: true; isPointer: true }
+        Property { name: "legend"; type: "QtCharts::QLegend"; isReadonly: true; isPointer: true }
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "backgroundColor"; type: "QColor" }
         Property { name: "dropShadowEnabled"; type: "bool" }
@@ -674,7 +674,7 @@ Module {
         Property {
             name: "margins"
             revision: 2
-            type: "DeclarativeMargins"
+            type: "QtCharts::DeclarativeMargins"
             isReadonly: true
             isPointer: true
         }
@@ -862,10 +862,10 @@ Module {
             "QtCharts/HorizontalBarSeries 2.0"
         ]
         exportMetaObjectRevisions: [1, 2, 2]
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
             name: "axisXChanged"
@@ -927,10 +927,10 @@ Module {
             "QtCharts/HorizontalPercentBarSeries 2.0"
         ]
         exportMetaObjectRevisions: [1, 2, 2]
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
             name: "axisXChanged"
@@ -992,10 +992,10 @@ Module {
             "QtCharts/HorizontalStackedBarSeries 2.0"
         ]
         exportMetaObjectRevisions: [1, 2, 2]
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
             name: "axisXChanged"
@@ -1061,12 +1061,12 @@ Module {
         ]
         exportMetaObjectRevisions: [0, 1, 2, 3, 3, 4]
         Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "width"; revision: 1; type: "double" }
         Property { name: "style"; revision: 1; type: "Qt::PenStyle" }
         Property { name: "capStyle"; revision: 1; type: "Qt::PenCapStyle" }
@@ -1227,10 +1227,10 @@ Module {
             "QtCharts/PercentBarSeries 2.0"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 2]
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
             name: "axisXChanged"
@@ -1373,12 +1373,12 @@ Module {
         ]
         exportMetaObjectRevisions: [0, 1, 2, 3, 4, 4, 5]
         Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "borderWidth"; revision: 1; type: "double" }
         Property { name: "declarativeChildren"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "brushFilename"; revision: 4; type: "string" }
@@ -1499,12 +1499,12 @@ Module {
         ]
         exportMetaObjectRevisions: [0, 1, 2, 3, 3, 4]
         Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisAngular"; revision: 3; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisRadial"; revision: 3; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisAngular"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisRadial"; revision: 3; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "width"; revision: 1; type: "double" }
         Property { name: "style"; revision: 1; type: "Qt::PenStyle" }
         Property { name: "capStyle"; revision: 1; type: "Qt::PenCapStyle" }
@@ -1626,10 +1626,10 @@ Module {
             "QtCharts/StackedBarSeries 2.0"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 2]
-        Property { name: "axisX"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisY"; revision: 1; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisXTop"; revision: 2; type: "QAbstractAxis"; isPointer: true }
-        Property { name: "axisYRight"; revision: 2; type: "QAbstractAxis"; isPointer: true }
+        Property { name: "axisX"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisY"; revision: 1; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisXTop"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
+        Property { name: "axisYRight"; revision: 2; type: "QtCharts::QAbstractAxis"; isPointer: true }
         Property { name: "seriesChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
             name: "axisXChanged"
@@ -1944,8 +1944,8 @@ Module {
     Component {
         name: "QtCharts::QAreaSeries"
         prototype: "QtCharts::QAbstractSeries"
-        Property { name: "upperSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true }
-        Property { name: "lowerSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true }
+        Property { name: "upperSeries"; type: "QtCharts::QLineSeries"; isReadonly: true; isPointer: true }
+        Property { name: "lowerSeries"; type: "QtCharts::QLineSeries"; isReadonly: true; isPointer: true }
         Property { name: "color"; type: "QColor" }
         Property { name: "borderColor"; type: "QColor" }
         Property { name: "pointLabelsFormat"; type: "string" }
@@ -2178,7 +2178,7 @@ Module {
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "series"; type: "QCandlestickSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QCandlestickSeries"; isPointer: true }
         Signal { name: "modelReplaced" }
         Signal { name: "seriesReplaced" }
     }
@@ -2260,7 +2260,7 @@ Module {
         Property { name: "startValue"; type: "double" }
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "categoriesLabels"; type: "QStringList"; isReadonly: true }
-        Property { name: "labelsPosition"; type: "AxisLabelsPosition" }
+        Property { name: "labelsPosition"; type: "QCategoryAxis::AxisLabelsPosition" }
         Signal { name: "categoriesChanged" }
         Signal {
             name: "labelsPositionChanged"
@@ -2306,7 +2306,7 @@ Module {
             "QtCharts/HBarModelMapper 2.0"
         ]
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "series"; type: "QAbstractBarSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QAbstractBarSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "firstBarSetRow"; type: "int" }
         Property { name: "lastBarSetRow"; type: "int" }
@@ -2320,7 +2320,7 @@ Module {
         prototype: "QtCharts::QBoxPlotModelMapper"
         exports: ["QtCharts/HBoxPlotModelMapper 2.0"]
         exportMetaObjectRevisions: [0]
-        Property { name: "series"; type: "QBoxPlotSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QBoxPlotSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "firstBoxSetRow"; type: "int" }
         Property { name: "lastBoxSetRow"; type: "int" }
@@ -2350,7 +2350,7 @@ Module {
             "QtCharts/HPieModelMapper 2.0"
         ]
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "series"; type: "QPieSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QPieSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "valuesRow"; type: "int" }
         Property { name: "labelsRow"; type: "int" }
@@ -2367,7 +2367,7 @@ Module {
             "QtCharts/HXYModelMapper 2.0"
         ]
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "series"; type: "QXYSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QXYSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "xRow"; type: "int" }
         Property { name: "yRow"; type: "int" }
@@ -2623,7 +2623,7 @@ Module {
             "QtCharts/VBarModelMapper 2.0"
         ]
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "series"; type: "QAbstractBarSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QAbstractBarSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "firstBarSetColumn"; type: "int" }
         Property { name: "lastBarSetColumn"; type: "int" }
@@ -2637,7 +2637,7 @@ Module {
         prototype: "QtCharts::QBoxPlotModelMapper"
         exports: ["QtCharts/VBoxPlotModelMapper 2.0"]
         exportMetaObjectRevisions: [0]
-        Property { name: "series"; type: "QBoxPlotSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QBoxPlotSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "firstBoxSetColumn"; type: "int" }
         Property { name: "lastBoxSetColumn"; type: "int" }
@@ -2667,7 +2667,7 @@ Module {
             "QtCharts/VPieModelMapper 2.0"
         ]
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "series"; type: "QPieSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QPieSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "valuesColumn"; type: "int" }
         Property { name: "labelsColumn"; type: "int" }
@@ -2684,7 +2684,7 @@ Module {
             "QtCharts/VXYModelMapper 2.0"
         ]
         exportMetaObjectRevisions: [0, 0]
-        Property { name: "series"; type: "QXYSeries"; isPointer: true }
+        Property { name: "series"; type: "QtCharts::QXYSeries"; isPointer: true }
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "xColumn"; type: "int" }
         Property { name: "yColumn"; type: "int" }