Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Conflicts:
	src/datavisualization/utils/qutils.h

Change-Id: Ic882590b5386697fb4af068e435704849ed5405c

1 files changed, 3 insertions, 3 deletions

diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 59299288..9b651d8d 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -57,8 +57,8 @@ public:
     };
     Q_DECLARE_FLAGS(DrawFlags, DrawFlag)
 
-    explicit QSurface3DSeries(QObject *parent = 0);
-    explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = 0);
+    explicit QSurface3DSeries(QObject *parent = Q_NULLPTR);
+    explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
     virtual ~QSurface3DSeries();
 
     void setDataProxy(QSurfaceDataProxy *proxy);
@@ -91,7 +91,7 @@ Q_SIGNALS:
     void textureFileChanged(const QString &filename);
 
 protected:
-    explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = 0);
+    explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
     QSurface3DSeriesPrivate *dptr();
     const QSurface3DSeriesPrivate *dptrc() const;