diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
| commit | 8427634773505f73ce030cf68761c4719eb03e5c (patch) | |
| tree | 56d0e488e533778782b55c54aa3ab07f0d5e888d /src/datavisualization/engine/q3dsurface.h | |
| parent | 3fb7ce6a29ca69237c777cc65a3831768e938782 (diff) | |
| parent | 364ed207af1becd2b85d93bc87d5db84624b4381 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
Diffstat (limited to 'src/datavisualization/engine/q3dsurface.h')
| -rw-r--r-- | src/datavisualization/engine/q3dsurface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index c5fe6d83..4935f595 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -48,7 +48,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public QAbstract3DGraph Q_PROPERTY(bool flipHorizontalGrid READ flipHorizontalGrid WRITE setFlipHorizontalGrid NOTIFY flipHorizontalGridChanged) public: - explicit Q3DSurface(const QSurfaceFormat *format = 0, QWindow *parent = 0); + explicit Q3DSurface(const QSurfaceFormat *format = Q_NULLPTR, QWindow *parent = Q_NULLPTR); virtual ~Q3DSurface(); void addSeries(QSurface3DSeries *series); |