Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I0ce2094980fbd70c017fea7748cbc5c224d974cc

src/winextras/qwinfunctions.h

@@ -89,7 +89,7 @@ namespace QtWin
     Q_WINEXTRAS_EXPORT QString stringFromHresult(HRESULT hresult);
     Q_WINEXTRAS_EXPORT QString errorStringFromHresult(HRESULT hresult);
 
-    Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = 0);
+    Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = Q_NULLPTR);
     Q_WINEXTRAS_EXPORT QColor realColorizationColor();
 
     Q_WINEXTRAS_EXPORT void setWindowExcludedFromPeek(QWindow *window, bool exclude);

src/winextras/qwinjumplist.h

@@ -58,7 +58,7 @@ class Q_WINEXTRAS_EXPORT QWinJumpList : public QObject
     Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier)
 
 public:
-    explicit QWinJumpList(QObject *parent = 0);
+    explicit QWinJumpList(QObject *parent = Q_NULLPTR);
     ~QWinJumpList();
 
     QString identifier() const;

src/winextras/qwintaskbarbutton.h

@@ -59,7 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject
     Q_PROPERTY(QWindow *window READ window WRITE setWindow)
 
 public:
-    explicit QWinTaskbarButton(QObject *parent = 0);
+    explicit QWinTaskbarButton(QObject *parent = Q_NULLPTR);
     ~QWinTaskbarButton();
 
     void setWindow(QWindow *window);

src/winextras/qwintaskbarprogress.h

@@ -59,7 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarProgress : public QObject
     Q_PROPERTY(bool stopped READ isStopped NOTIFY stoppedChanged)
 
 public:
-    explicit QWinTaskbarProgress(QObject *parent = 0);
+    explicit QWinTaskbarProgress(QObject *parent = Q_NULLPTR);
     ~QWinTaskbarProgress();
 
     int value() const;

src/winextras/qwinthumbnailtoolbar.h

@@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolBar : public QObject
     Q_PROPERTY(QPixmap iconicLivePreviewPixmap READ iconicLivePreviewPixmap WRITE setIconicLivePreviewPixmap)
 
 public:
-    explicit QWinThumbnailToolBar(QObject *parent = 0);
+    explicit QWinThumbnailToolBar(QObject *parent = Q_NULLPTR);
     ~QWinThumbnailToolBar();
 
     void setWindow(QWindow *window);

src/winextras/qwinthumbnailtoolbutton.h

@@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolButton : public QObject
     Q_PROPERTY(bool flat READ isFlat WRITE setFlat)
 
 public:
-    explicit QWinThumbnailToolButton(QObject *parent = 0);
+    explicit QWinThumbnailToolButton(QObject *parent = Q_NULLPTR);
     ~QWinThumbnailToolButton();
 
     void setToolTip(const QString &toolTip);

src/winextras/qwinthumbnailtoolbutton_p.h

@@ -61,7 +61,7 @@ class QWinThumbnailToolBar;
 class QWinThumbnailToolButtonPrivate
 {
 public:
-    QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(0) {}
+    QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(Q_NULLPTR) {}
     QString toolTip;
     QIcon icon;
     bool enabled;