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/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h
index 4ebe160d..e4a7645c 100644
--- a/src/datavisualization/theme/q3dtheme.h
+++ b/src/datavisualization/theme/q3dtheme.h
@@ -88,8 +88,8 @@ public:
     };
 
 public:
-    explicit Q3DTheme(QObject *parent = 0);
-    explicit Q3DTheme(Theme themeType, QObject *parent = 0);
+    explicit Q3DTheme(QObject *parent = Q_NULLPTR);
+    explicit Q3DTheme(Theme themeType, QObject *parent = Q_NULLPTR);
     virtual ~Q3DTheme();
 
     void setType(Theme themeType);
@@ -183,7 +183,7 @@ Q_SIGNALS:
     void colorStyleChanged(Q3DTheme::ColorStyle style);
 
 protected:
-    explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0);
+    explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = Q_NULLPTR);
 
     QScopedPointer<Q3DThemePrivate> d_ptr;