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

Change-Id: I0ce2094980fbd70c017fea7748cbc5c224d974cc

18 files changed, 7 insertions, 7 deletions

diff --git a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png
index 682449b..e0a6afe 100644
--- a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png
+++ b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png
diff --git a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png
index b03d192..8742da2 100644
--- a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png
+++ b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png
diff --git a/examples/winextras/musicplayer/images/musicplayer.png b/examples/winextras/musicplayer/images/musicplayer.png
index 7d3e97e..ecbff0c 100644
--- a/examples/winextras/musicplayer/images/musicplayer.png
+++ b/examples/winextras/musicplayer/images/musicplayer.png
diff --git a/examples/winextras/quickplayer/images/media-pause-16.png b/examples/winextras/quickplayer/images/media-pause-16.png
index 6cb1fd7..8d06287 100644
--- a/examples/winextras/quickplayer/images/media-pause-16.png
+++ b/examples/winextras/quickplayer/images/media-pause-16.png
diff --git a/examples/winextras/quickplayer/images/media-seek-backward-32.png b/examples/winextras/quickplayer/images/media-seek-backward-32.png
index a21d137..c14112e 100644
--- a/examples/winextras/quickplayer/images/media-seek-backward-32.png
+++ b/examples/winextras/quickplayer/images/media-seek-backward-32.png
diff --git a/examples/winextras/quickplayer/images/media-seek-forward-32.png b/examples/winextras/quickplayer/images/media-seek-forward-32.png
index 4f8d370..00c0747 100644
--- a/examples/winextras/quickplayer/images/media-seek-forward-32.png
+++ b/examples/winextras/quickplayer/images/media-seek-forward-32.png
diff --git a/examples/winextras/quickplayer/images/quickplayer.png b/examples/winextras/quickplayer/images/quickplayer.png
index 7d3e97e..ecbff0c 100644
--- a/examples/winextras/quickplayer/images/quickplayer.png
+++ b/examples/winextras/quickplayer/images/quickplayer.png
diff --git a/src/winextras/doc/images/thumbbar.png b/src/winextras/doc/images/thumbbar.png
index 2f0db6d..c53077d 100644
--- a/src/winextras/doc/images/thumbbar.png
+++ b/src/winextras/doc/images/thumbbar.png
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h
index c1dc340..7190258 100644
--- a/src/winextras/qwinfunctions.h
+++ b/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);
diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h
index af637b4..3900998 100644
--- a/src/winextras/qwinjumplist.h
+++ b/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;
diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h
index 96dcc1c..4685744 100644
--- a/src/winextras/qwintaskbarbutton.h
+++ b/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);
diff --git a/src/winextras/qwintaskbarprogress.h b/src/winextras/qwintaskbarprogress.h
index c73afa2..6b31eef 100644
--- a/src/winextras/qwintaskbarprogress.h
+++ b/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;
diff --git a/src/winextras/qwinthumbnailtoolbar.h b/src/winextras/qwinthumbnailtoolbar.h
index b5c78c0..4c98c70 100644
--- a/src/winextras/qwinthumbnailtoolbar.h
+++ b/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);
diff --git a/src/winextras/qwinthumbnailtoolbutton.h b/src/winextras/qwinthumbnailtoolbutton.h
index ecd57f6..6a14894 100644
--- a/src/winextras/qwinthumbnailtoolbutton.h
+++ b/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);
diff --git a/src/winextras/qwinthumbnailtoolbutton_p.h b/src/winextras/qwinthumbnailtoolbutton_p.h
index 1b34ca5..cc212b3 100644
--- a/src/winextras/qwinthumbnailtoolbutton_p.h
+++ b/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;
diff --git a/tests/auto/qpixmap/data/icon_8bpp_16x16.png b/tests/auto/qpixmap/data/icon_8bpp_16x16.png
index e9a995e..03b1a65 100644
--- a/tests/auto/qpixmap/data/icon_8bpp_16x16.png
+++ b/tests/auto/qpixmap/data/icon_8bpp_16x16.png
diff --git a/tests/auto/qpixmap/data/icon_8bpp_32x32.png b/tests/auto/qpixmap/data/icon_8bpp_32x32.png
index 41ef57f..0ef47c5 100644
--- a/tests/auto/qpixmap/data/icon_8bpp_32x32.png
+++ b/tests/auto/qpixmap/data/icon_8bpp_32x32.png
diff --git a/tests/auto/qpixmap/data/icon_8bpp_48x48.png b/tests/auto/qpixmap/data/icon_8bpp_48x48.png
index 35d60d1..2060854 100644
--- a/tests/auto/qpixmap/data/icon_8bpp_48x48.png
+++ b/tests/auto/qpixmap/data/icon_8bpp_48x48.png