summaryrefslogtreecommitdiffstats
path: root/src/chartsqml2/declarativesplineseries_p.h
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-09-19 08:50:25 +0200
committerKai Koehne <kai.koehne@qt.io>2018-09-21 08:13:57 +0000
commitf6c9d0b59603d32a3a91dd166239429b3b056c6e (patch)
treefacc55e8564c21fd7277a31b367c4fce2e486a7e /src/chartsqml2/declarativesplineseries_p.h
parent082f3b450028b603bf471b3c32b16c669047347a (diff)
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>
Diffstat (limited to 'src/chartsqml2/declarativesplineseries_p.h')
-rw-r--r--src/chartsqml2/declarativesplineseries_p.h12
1 files changed, 6 insertions, 6 deletions
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)