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/charts/barchart | |
| 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/charts/barchart')
| -rw-r--r-- | src/charts/barchart/qhbarmodelmapper.h | 2 | ||||
| -rw-r--r-- | src/charts/barchart/qvbarmodelmapper.h | 2 |
2 files changed, 2 insertions, 2 deletions
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) |