Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/corelib/tools/qbytearray.cpp
	src/gui/kernel/qplatformsystemtrayicon.cpp
	src/gui/kernel/qplatformsystemtrayicon.h
	src/plugins/platforms/xcb/xcb-plugin.pro

Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79

5 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
index 83af3960a6..a58336e511 100644
--- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
@@ -14,3 +14,4 @@ wince*: {
    DEPLOYMENT += addPlugins
 }
 TESTDATA += icons/*
+android:RESOURCES+=qicoimageformat.qrc
diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc b/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc
new file mode 100644
index 0000000000..1e0ee8aa8c
--- /dev/null
+++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.qrc
@@ -0,0 +1,18 @@
+<RCC>
+  <qresource prefix="/">
+    <file>icons/invalid/35floppy.ico</file>
+    <file>icons/valid/35FLOPPY.ICO</file>
+    <file>icons/valid/abcardWindow.ico</file>
+    <file>icons/valid/AddPerfMon.ico</file>
+    <file>icons/valid/App.ico</file>
+    <file>icons/valid/Obj_N2_Internal_Mem.ico</file>
+    <file>icons/valid/Qt.ico</file>
+    <file>icons/valid/semitransparent.ico</file>
+    <file>icons/valid/Status_Play.ico</file>
+    <file>icons/valid/TIMER01.ICO</file>
+    <file>icons/valid/trolltechlogo_tiny.ico</file>
+    <file>icons/valid/WORLD.ico</file>
+    <file>icons/valid/WORLDH.ico</file>
+    <file>icons/valid/yellow.cur</file>
+  </qresource>
+</RCC>
diff --git a/tests/auto/gui/image/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc
index 469a0a21b4..dc11a87ddd 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.qrc
+++ b/tests/auto/gui/image/qicon/tst_qicon.qrc
@@ -1,5 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/">
+<file>tst_qicon.cpp</file>
 <file>image.png</file>
 <file>rect.png</file>
 <file>./icons/testtheme/16x16/actions/appointment-new.png</file>
diff --git a/tests/auto/gui/image/qmovie/resources.qrc b/tests/auto/gui/image/qmovie/resources.qrc
index ce459a0e7e..077f6ff004 100644
--- a/tests/auto/gui/image/qmovie/resources.qrc
+++ b/tests/auto/gui/image/qmovie/resources.qrc
@@ -1,5 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
+    <file>animations/comicsecard.gif</file>
     <file>animations/corrupt.gif</file>
+    <file>animations/trolltech.gif</file>
 </qresource>
 </RCC>
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 12ca2bb68a..41a53ddd55 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -316,6 +316,8 @@ void tst_QWindow::positioning()
     QTRY_VERIFY(window.received(QEvent::Resize) > 0);
 #endif
 
+    QTest::qWait(2000);
+
     QTRY_COMPARE(originalPos, window.position());
     QTRY_COMPARE(originalFramePos, window.framePosition());
     QTRY_COMPARE(originalMargins, window.frameMargins());