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

diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h
index 9498c7eb..bd2fe7f4 100644
--- a/src/datavisualization/data/qcustom3dvolume.h
+++ b/src/datavisualization/data/qcustom3dvolume.h
@@ -62,12 +62,12 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem
 
 public:
 
-    explicit QCustom3DVolume(QObject *parent = 0);
+    explicit QCustom3DVolume(QObject *parent = Q_NULLPTR);
     explicit QCustom3DVolume(const QVector3D &position, const QVector3D &scaling,
                              const QQuaternion &rotation, int textureWidth,
                              int textureHeight, int textureDepth,
                              QVector<uchar> *textureData, QImage::Format textureFormat,
-                             const QVector<QRgb> &colorTable, QObject *parent = 0);
+                             const QVector<QRgb> &colorTable, QObject *parent = Q_NULLPTR);
     virtual ~QCustom3DVolume();
 
     void setTextureWidth(int value);