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, 4 insertions, 4 deletions

diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 68c1978b..610ac483 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -50,9 +50,9 @@ class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDa
     Q_PROPERTY(float maxZValue READ maxZValue WRITE setMaxZValue NOTIFY maxZValueChanged)
 
 public:
-    explicit QHeightMapSurfaceDataProxy(QObject *parent = 0);
-    explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = 0);
-    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = 0);
+    explicit QHeightMapSurfaceDataProxy(QObject *parent = Q_NULLPTR);
+    explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = Q_NULLPTR);
+    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = Q_NULLPTR);
     virtual ~QHeightMapSurfaceDataProxy();
 
     void setHeightMap(const QImage &image);
@@ -79,7 +79,7 @@ Q_SIGNALS:
     void maxZValueChanged(float value);
 
 protected:
-    explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = 0);
+    explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
     QHeightMapSurfaceDataProxyPrivate *dptr();
     const QHeightMapSurfaceDataProxyPrivate *dptrc() const;