diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
| commit | 13a8c4eb9977a962fd70a91c6e5801f7a6506900 (patch) | |
| tree | c7baf2d0bfedcea8e51d996d5a336d29064d73d7 /src/datavisualization/axis/qvalue3daxisformatter.h | |
| parent | 5ad9e88e1a08efc57739e9ea6d98199b416a4178 (diff) | |
| parent | 8427634773505f73ce030cf68761c4719eb03e5c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I17383a4cdebb3c54489f6f39e1ad7ae136d80971
Diffstat (limited to 'src/datavisualization/axis/qvalue3daxisformatter.h')
| -rw-r--r-- | src/datavisualization/axis/qvalue3daxisformatter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h index 76ad6055..72392d0c 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -46,9 +46,9 @@ class QT_DATAVISUALIZATION_EXPORT QValue3DAxisFormatter : public QObject { Q_OBJECT protected: - explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = 0); + explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = Q_NULLPTR); public: - explicit QValue3DAxisFormatter(QObject *parent = 0); + explicit QValue3DAxisFormatter(QObject *parent = Q_NULLPTR); virtual ~QValue3DAxisFormatter(); protected: |