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/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 18ec2fdf..5b6fc17e 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -45,8 +45,8 @@ class QT_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries
     Q_PROPERTY(float itemSize READ itemSize WRITE setItemSize NOTIFY itemSizeChanged)
 
 public:
-    explicit QScatter3DSeries(QObject *parent = 0);
-    explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = 0);
+    explicit QScatter3DSeries(QObject *parent = Q_NULLPTR);
+    explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
     virtual ~QScatter3DSeries();
 
     void setDataProxy(QScatterDataProxy *proxy);
@@ -65,7 +65,7 @@ Q_SIGNALS:
     void itemSizeChanged(float size);
 
 protected:
-    explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = 0);
+    explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
     QScatter3DSeriesPrivate *dptr();
     const QScatter3DSeriesPrivate *dptrc() const;