Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf
	src/imports/winextras/qquickjumplist.cpp

Change-Id: I2272b873c872bbabf7e274a478e3d16b92cdb434

12 files changed, 2 insertions, 13 deletions

diff --git a/examples/winextras/musicplayer/images/musicplayer.ico b/examples/winextras/musicplayer/images/musicplayer.ico
deleted file mode 100644
index fef1dee..0000000
--- a/examples/winextras/musicplayer/images/musicplayer.ico
+++ /dev/null
diff --git a/examples/winextras/musicplayer/images/musicplayer.png b/examples/winextras/musicplayer/images/musicplayer.png
deleted file mode 100644
index ecbff0c..0000000
--- a/examples/winextras/musicplayer/images/musicplayer.png
+++ /dev/null
diff --git a/examples/winextras/musicplayer/images/qt-logo.ico b/examples/winextras/musicplayer/images/qt-logo.ico
new file mode 100644
index 0000000..b5ac59b
--- /dev/null
+++ b/examples/winextras/musicplayer/images/qt-logo.ico
diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp
index 6a74bca..1386da5 100644
--- a/examples/winextras/musicplayer/main.cpp
+++ b/examples/winextras/musicplayer/main.cpp
@@ -97,7 +97,6 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName(QStringLiteral("QtWinExtras"));
     QCoreApplication::setOrganizationDomain("qt-project.org");
     QGuiApplication::setApplicationDisplayName(QStringLiteral("QtWinExtras Music Player"));
-    QApplication::setWindowIcon(QIcon(QStringLiteral(":/logo.png")));
 
     if (!associateFileTypes())
         return -1;
diff --git a/examples/winextras/musicplayer/musicplayer.pro b/examples/winextras/musicplayer/musicplayer.pro
index 73968cf..ae8f4eb 100644
--- a/examples/winextras/musicplayer/musicplayer.pro
+++ b/examples/winextras/musicplayer/musicplayer.pro
@@ -12,10 +12,7 @@ SOURCES = \
     musicplayer.cpp \
     volumebutton.cpp
 
-RESOURCES += \
-    musicplayer.qrc
-
-RC_ICONS = images/musicplayer.ico
+RC_ICONS = images/qt-logo.ico
 
 target.path = $$[QT_INSTALL_EXAMPLES]/winextras/musicplayer
 INSTALLS += target
diff --git a/examples/winextras/musicplayer/musicplayer.qrc b/examples/winextras/musicplayer/musicplayer.qrc
deleted file mode 100644
index b1a0029..0000000
--- a/examples/winextras/musicplayer/musicplayer.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="musicplayer.png">images/musicplayer.png</file>
-</qresource>
-</RCC>
diff --git a/examples/winextras/musicplayer/musicplayer.rc b/examples/winextras/musicplayer/musicplayer.rc
deleted file mode 100644
index 00a51ee..0000000
--- a/examples/winextras/musicplayer/musicplayer.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1               ICON    DISCARDABLE     "images\\musicplayer.ico"
diff --git a/examples/winextras/quickplayer/images/qt-logo.ico b/examples/winextras/quickplayer/images/qt-logo.ico
new file mode 100644
index 0000000..b5ac59b
--- /dev/null
+++ b/examples/winextras/quickplayer/images/qt-logo.ico
diff --git a/examples/winextras/quickplayer/images/quickplayer.ico b/examples/winextras/quickplayer/images/quickplayer.ico
deleted file mode 100644
index fef1dee..0000000
--- a/examples/winextras/quickplayer/images/quickplayer.ico
+++ /dev/null
diff --git a/examples/winextras/quickplayer/images/quickplayer.png b/examples/winextras/quickplayer/images/quickplayer.png
deleted file mode 100644
index ecbff0c..0000000
--- a/examples/winextras/quickplayer/images/quickplayer.png
+++ /dev/null
diff --git a/examples/winextras/quickplayer/quickplayer.pro b/examples/winextras/quickplayer/quickplayer.pro
index f7474f7..77f9c97 100644
--- a/examples/winextras/quickplayer/quickplayer.pro
+++ b/examples/winextras/quickplayer/quickplayer.pro
@@ -12,7 +12,7 @@ OTHER_FILES += \
 RESOURCES += \
     quickplayer.qrc
 
-RC_ICONS = images/quickplayer.ico
+RC_ICONS = images/qt-logo.ico
 
 target.path = $$[QT_INSTALL_EXAMPLES]/winextras/quickplayer
 INSTALLS += target
diff --git a/examples/winextras/quickplayer/quickplayer.qrc b/examples/winextras/quickplayer/quickplayer.qrc
index 7515bd2..e046252 100644
--- a/examples/winextras/quickplayer/quickplayer.qrc
+++ b/examples/winextras/quickplayer/quickplayer.qrc
@@ -8,6 +8,5 @@
     <file alias="backward-32.png">images/media-seek-backward-32.png</file>
     <file alias="forward-32.png">images/media-seek-forward-32.png</file>
     <file alias="stop-32.png">images/media-stop-32.png</file>
-    <file alias="quickplayer.png">images/quickplayer.png</file>
 </qresource>
 </RCC>