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/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h
index 5cbec8c6..e4178bbf 100644
--- a/src/datavisualization/data/qcustom3dlabel.h
+++ b/src/datavisualization/data/qcustom3dlabel.h
@@ -53,10 +53,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem
     Q_PROPERTY(bool facingCamera READ isFacingCamera WRITE setFacingCamera NOTIFY facingCameraChanged)
 
 public:
-    explicit QCustom3DLabel(QObject *parent = 0);
+    explicit QCustom3DLabel(QObject *parent = Q_NULLPTR);
     explicit QCustom3DLabel(const QString &text, const QFont &font, const QVector3D &position,
                             const QVector3D &scaling, const QQuaternion &rotation,
-                            QObject *parent = 0);
+                            QObject *parent = Q_NULLPTR);
     virtual ~QCustom3DLabel();
 
     void setText(const QString &text);