Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Conflicts:
	src/datavisualization/utils/qutils.h

Change-Id: Ic882590b5386697fb4af068e435704849ed5405c

3 files changed, 3 insertions, 3 deletions

diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index 74e059ed..f2028cd1 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -45,7 +45,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandl
     Q_PROPERTY(bool zoomAtTargetEnabled READ isZoomAtTargetEnabled WRITE setZoomAtTargetEnabled NOTIFY zoomAtTargetEnabledChanged)
 
 public:
-    explicit Q3DInputHandler(QObject *parent = 0);
+    explicit Q3DInputHandler(QObject *parent = Q_NULLPTR);
     virtual ~Q3DInputHandler();
 
     void setRotationEnabled(bool enable);
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 9538902b..753a34fa 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -58,7 +58,7 @@ public:
     };
 
 protected:
-    explicit QAbstract3DInputHandler(QObject *parent = 0);
+    explicit QAbstract3DInputHandler(QObject *parent = Q_NULLPTR);
 public:
     virtual ~QAbstract3DInputHandler();
 
diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index 0f7087f7..b6f2a82e 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -41,7 +41,7 @@ class QT_DATAVISUALIZATION_EXPORT QTouch3DInputHandler : public Q3DInputHandler
     Q_OBJECT
 
 public:
-    explicit QTouch3DInputHandler(QObject *parent = 0);
+    explicit QTouch3DInputHandler(QObject *parent = Q_NULLPTR);
     virtual ~QTouch3DInputHandler();
 
     // Input event listeners