diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-09-19 08:50:25 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-09-21 08:13:57 +0000 |
| commit | f6c9d0b59603d32a3a91dd166239429b3b056c6e (patch) | |
| tree | facc55e8564c21fd7277a31b367c4fce2e486a7e /src/chartsqml2/declarativechart_p.h | |
| parent | 082f3b450028b603bf471b3c32b16c669047347a (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/declarativechart_p.h')
| -rw-r--r-- | src/chartsqml2/declarativechart_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) |