diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-14 12:44:18 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-14 09:56:29 +0000 |
| commit | b3a1e386ea584df1a16b645845b22942016464ca (patch) | |
| tree | a1c560c3fffe073e4d2b4b8d0947ba75559d5b7c | |
| parent | efb38adac6cb3018bc344bef9d4890f22142033e (diff) | |
Add revisioning to new QValueAxis properties
Change-Id: I8a10cf5b4badba479f26ce4fd3d2b373c4b058f7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/charts/axis/valueaxis/qvalueaxis.h | 12 | ||||
| -rw-r--r-- | src/charts/doc/snippets/doc_src_qmlcharts.cpp | 2 | ||||
| -rw-r--r-- | src/charts/doc/src/qtcharts.qdoc | 2 | ||||
| -rw-r--r-- | src/chartsqml2/chartsqml2_plugin.cpp | 3 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h index 8e704f6d..e7bb19f4 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.h +++ b/src/charts/axis/valueaxis/qvalueaxis.h @@ -44,9 +44,9 @@ class QT_CHARTS_EXPORT QValueAxis : public QAbstractAxis Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY maxChanged) Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged) - Q_PROPERTY(qreal tickAnchor READ tickAnchor WRITE setTickAnchor NOTIFY tickAnchorChanged) - Q_PROPERTY(qreal tickInterval READ tickInterval WRITE setTickInterval NOTIFY tickIntervalChanged) - Q_PROPERTY(TickType tickType READ tickType WRITE setTickType NOTIFY tickTypeChanged) + Q_PROPERTY(qreal tickAnchor READ tickAnchor WRITE setTickAnchor NOTIFY tickAnchorChanged REVISION 1) + Q_PROPERTY(qreal tickInterval READ tickInterval WRITE setTickInterval NOTIFY tickIntervalChanged REVISION 1) + Q_PROPERTY(TickType tickType READ tickType WRITE setTickType NOTIFY tickTypeChanged REVISION 1) Q_ENUMS(TickType) public: @@ -97,9 +97,9 @@ Q_SIGNALS: void tickCountChanged(int tickCount); void minorTickCountChanged(int tickCount); void labelFormatChanged(const QString &format); - void tickIntervalChanged(qreal interval); - void tickAnchorChanged(qreal anchor); - void tickTypeChanged(QValueAxis::TickType type); + Q_REVISION(1) void tickIntervalChanged(qreal interval); + Q_REVISION(1) void tickAnchorChanged(qreal anchor); + Q_REVISION(1) void tickTypeChanged(QValueAxis::TickType type); private: Q_DECLARE_PRIVATE(QValueAxis) diff --git a/src/charts/doc/snippets/doc_src_qmlcharts.cpp b/src/charts/doc/snippets/doc_src_qmlcharts.cpp index b087fa95..8d3b8822 100644 --- a/src/charts/doc/snippets/doc_src_qmlcharts.cpp +++ b/src/charts/doc/snippets/doc_src_qmlcharts.cpp @@ -28,5 +28,5 @@ ****************************************************************************/ //! [0] -import QtCharts 2.2 +import QtCharts 2.3 //! [0] diff --git a/src/charts/doc/src/qtcharts.qdoc b/src/charts/doc/src/qtcharts.qdoc index 60144016..4758de69 100644 --- a/src/charts/doc/src/qtcharts.qdoc +++ b/src/charts/doc/src/qtcharts.qdoc @@ -59,7 +59,7 @@ */ /*! - \qmlmodule QtCharts 2.2 + \qmlmodule QtCharts 2.3 \title Qt Charts QML Types \ingroup qmlmodules diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index 7c5f7902..3720a0a8 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -343,6 +343,9 @@ public: QLatin1String("Trying to create uncreatable: CandlestickModelMapper.")); qmlRegisterType<QHCandlestickModelMapper>(uri, 2, 2, "HCandlestickModelMapper"); qmlRegisterType<QVCandlestickModelMapper>(uri, 2, 2, "VCandlestickModelMapper"); + + // QtCharts 2.3 + qmlRegisterType<QValueAxis, 1>(uri, 2, 3, "ValueAxis"); } }; |