diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:30:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:30:32 +0200 |
| commit | 97bb01ce5d85ac94ed019f0abd7a08917ae4f80a (patch) | |
| tree | 2974b3181e1020c0b26e2e75375e6af73afad781 /src/charts/axis/categoryaxis | |
| parent | bbf52870f4e335c0d169907d4398a12cb41ca3a1 (diff) | |
| parent | 35b800491709bafb58c3c8e29f953954f2a7897a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
.qmake.conf
README
src/charts/qchartglobal.h
Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
Diffstat (limited to 'src/charts/axis/categoryaxis')
| -rw-r--r-- | src/charts/axis/categoryaxis/qcategoryaxis.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h index cfd05a62..eac9b4c1 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis.h @@ -53,11 +53,11 @@ public: AxisLabelsPositionOnValue = 0x1 }; - explicit QCategoryAxis(QObject *parent = 0); + explicit QCategoryAxis(QObject *parent = Q_NULLPTR); ~QCategoryAxis(); protected: - QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = 0); + QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); public: AxisType type() const; |