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/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index cdf54414..3372a766 100644
--- a/src/datavisualization/data/qcustom3ditem.h
+++ b/src/datavisualization/data/qcustom3ditem.h
@@ -53,10 +53,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject
     Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION 1)
 
 public:
-    explicit QCustom3DItem(QObject *parent = 0);
+    explicit QCustom3DItem(QObject *parent = Q_NULLPTR);
     explicit QCustom3DItem(const QString &meshFile, const QVector3D &position,
                            const QVector3D &scaling, const QQuaternion &rotation,
-                           const QImage &texture, QObject *parent = 0);
+                           const QImage &texture, QObject *parent = Q_NULLPTR);
     virtual ~QCustom3DItem();
 
     void setMeshFile(const QString &meshFile);
@@ -102,7 +102,7 @@ Q_SIGNALS:
     Q_REVISION(1) void scalingAbsoluteChanged(bool scalingAbsolute);
 
 protected:
-    QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = 0);
+    QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = Q_NULLPTR);
 
     QScopedPointer<QCustom3DItemPrivate> d_ptr;