diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-10 16:26:11 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-11 10:42:53 +0300 |
| commit | d93f5f3b64fdb52cc150232f6b6d80ffdb57db78 (patch) | |
| tree | 4a99ecc02c2e885b56abb1082527e482967b84f8 /src/datavisualization/axis/q3dcategoryaxis.h | |
| parent | d315336b202ec1c1260f96945a23fde6d2c41b69 (diff) | |
QBarDataProxy now has list of row and column labels
Category axes use those labels if no explicit labels are set to them.
+ Other misc fixes
Task-number: QTRD-2252
Change-Id: Idc15e0cc1cdeb08195b2e2baeead9cfef2533e04
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/axis/q3dcategoryaxis.h')
| -rw-r--r-- | src/datavisualization/axis/q3dcategoryaxis.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/datavisualization/axis/q3dcategoryaxis.h b/src/datavisualization/axis/q3dcategoryaxis.h index 8b7f966c..bf5e66fd 100644 --- a/src/datavisualization/axis/q3dcategoryaxis.h +++ b/src/datavisualization/axis/q3dcategoryaxis.h @@ -28,9 +28,6 @@ class Q3DCategoryAxisPrivate; class QT_DATAVISUALIZATION_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis { Q_OBJECT - // Note: categoryLabels actually reads/writes the labels property in abstract axis, - // which is read only there. Since subclass cannot have property with same name, - // this partially duplicate property is necessary. Q_PROPERTY(QStringList categoryLabels READ categoryLabels WRITE setCategoryLabels) public: @@ -47,6 +44,7 @@ protected: private: Q_DISABLE_COPY(Q3DCategoryAxis) + friend class Bars3DController; }; QT_DATAVISUALIZATION_END_NAMESPACE |