diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-25 12:38:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-25 12:38:18 +0200 |
| commit | 3ad4866256e9efdc313ac557326c2796dfac8dfb (patch) | |
| tree | 93551b269fa395137cc26b2b3c85be89f6b1c163 /src/charts/xychart | |
| parent | d87ebea3be105e8e5f46e096af5109b9d2eb7e0a (diff) | |
| parent | f6c9d0b59603d32a3a91dd166239429b3b056c6e (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta1
Conflicts:
src/chartsqml2/declarativechart_p.h
src/chartsqml2/plugins.qmltypes
Change-Id: Ib61ca7ee3c40e02cb346c6b8cc9642f8358bf3e9
Diffstat (limited to 'src/charts/xychart')
| -rw-r--r-- | src/charts/xychart/qhxymodelmapper.h | 2 | ||||
| -rw-r--r-- | src/charts/xychart/qvxymodelmapper.h | 2 |
2 files changed, 2 insertions, 2 deletions
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) |