summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-02-25 17:37:03 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-02-25 15:49:26 +0000
commitc071170b1dd51f6f682a8b1aeea158d33b84df3b (patch)
tree1afd371196c4fc669cffa7dc31a9c353159a8dd9 /src
parentdd07bf6a9aadf1db040df12fb8796782fe6b46f6 (diff)
labelsEditable is not supported in QML, so don't make it a property
For C++ purposes, Q_PROPERTY is not needed. Remove it so that an unsupported property is not exposed to QML. Change-Id: I106de5eeb3c0b7cb732fa3195d078cbb85a9c86c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/charts/axis/qabstractaxis.cpp25
-rw-r--r--src/charts/axis/qabstractaxis.h1
2 files changed, 14 insertions, 12 deletions
diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp
index f9d211ca..bf7d7dfb 100644
--- a/src/charts/axis/qabstractaxis.cpp
+++ b/src/charts/axis/qabstractaxis.cpp
@@ -102,17 +102,6 @@ QT_CHARTS_BEGIN_NAMESPACE
*/
/*!
- \property QAbstractAxis::labelsEditable
- \since 5.13
- \brief This property holds whether the labels of the axis are editable or not.
- When the labels set to editable the user will be able to change the range of the
- axis conveniently by editing any of the labels. This feature is only implemented
- for the QValueAxis and the QDateTimeAxis.
-
- By default, the value is \c false.
-*/
-
-/*!
\property QAbstractAxis::labelsBrush
\brief The brush used to draw the labels.
@@ -965,6 +954,16 @@ bool QAbstractAxis::isReverse() const
return d_ptr->m_reverse;
}
+/*!
+ Sets axis labels editability to \a editable.
+
+ When the labels are editable the user will be able to change the range of the
+ axis conveniently by editing any of the labels. This feature is only supported
+ for the QValueAxis and the QDateTimeAxis.
+
+ By default, labels are not editable.
+ \since 5.13
+*/
void QAbstractAxis::setLabelsEditable(bool editable)
{
if (d_ptr->m_labelsEditable != editable) {
@@ -979,6 +978,10 @@ void QAbstractAxis::setLabelsEditable(bool editable)
}
}
+/*!
+ Returns \c true if axis labels are editable.
+ \since 5.13
+*/
bool QAbstractAxis::labelsEditable() const
{
return d_ptr->m_labelsEditable;
diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h
index a1b91a43..b7384155 100644
--- a/src/charts/axis/qabstractaxis.h
+++ b/src/charts/axis/qabstractaxis.h
@@ -54,7 +54,6 @@ class QT_CHARTS_EXPORT QAbstractAxis : public QObject
Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged)
Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont NOTIFY labelsFontChanged)
Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
- Q_PROPERTY(bool labelsEditable READ labelsEditable WRITE setLabelsEditable NOTIFY labelsEditableChanged)
//grid
Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridVisibleChanged)
Q_PROPERTY(QPen gridLinePen READ gridLinePen WRITE setGridLinePen NOTIFY gridLinePenChanged)