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

4 files changed, 22 insertions, 23 deletions

diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
index 12ae6ec6fb..6ee13b5c71 100644
--- a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 
     ServerObject obj(objectPath, con);
     printf("ready.\n");
+    fflush(stdout);
     return app.exec();
 }
 
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.pro b/tests/benchmarks/dbus/qdbusperformance/server/server.pro
index b38623b099..c913e90afb 100644
--- a/tests/benchmarks/dbus/qdbusperformance/server/server.pro
+++ b/tests/benchmarks/dbus/qdbusperformance/server/server.pro
@@ -1,6 +1,7 @@
 SOURCES = server.cpp
 HEADERS = ../serverobject.h
 TARGET = server
+DESTDIR = .
 QT += dbus
 QT -= gui
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
index 5b3be02c33..4bc3c94cd0 100644
--- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
@@ -80,11 +80,13 @@ void tst_QDBusPerformance::initTestCase()
             &QTestEventLoop::instance(), SLOT(exitLoop()));
 
 #ifdef Q_OS_WIN
-    proc.start("server");
+#  define EXE ".exe"
 #else
-    proc.start("./server/server");
+#  define EXE ""
 #endif
-    QVERIFY(proc.waitForStarted());
+    proc.start(QFINDTESTDATA("server/server" EXE));
+    QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
+    QVERIFY(proc.waitForReadyRead());
 
     QTestEventLoop::instance().enterLoop(5);
     QVERIFY(con.interface()->isServiceRegistered(serviceName));
diff --git a/tests/benchmarks/dbus/qdbustype/main.cpp b/tests/benchmarks/dbus/qdbustype/main.cpp
index b37a6930e2..b405df99d5 100644
--- a/tests/benchmarks/dbus/qdbustype/main.cpp
+++ b/tests/benchmarks/dbus/qdbustype/main.cpp
@@ -57,29 +57,24 @@ void tst_QDBusType::benchmarkSignature_data()
     QTest::addColumn<QString>("data");
     QTest::addColumn<bool>("useNative");
 
-    for (int loopCount = 0; loopCount < 2; ++loopCount) {
-        bool useNative = loopCount;
-        QByteArray prefix = useNative ? "native-" : "";
+    benchmarkAddRow("single-invalid", "~");
+    benchmarkAddRow("single-invalid-array", "a~");
+    benchmarkAddRow("single-invalid-struct", "(.)");
 
-        benchmarkAddRow("single-invalid", "~");
-        benchmarkAddRow("single-invalid-array", "a~");
-        benchmarkAddRow("single-invalid-struct", "(.)");
+    benchmarkAddRow("single-char", "b");
+    benchmarkAddRow("single-array", "as");
+    benchmarkAddRow("single-simplestruct", "(y)");
+    benchmarkAddRow("single-simpledict", "a{sv}");
+    benchmarkAddRow("single-complexdict", "a{s(aya{io})}");
 
-        benchmarkAddRow("single-char", "b");
-        benchmarkAddRow("single-array", "as");
-        benchmarkAddRow("single-simplestruct", "(y)");
-        benchmarkAddRow("single-simpledict", "a{sv}");
-        benchmarkAddRow("single-complexdict", "a{s(aya{io})}");
+    benchmarkAddRow("multiple-char", "ssg");
+    benchmarkAddRow("multiple-arrays", "asasay");
 
-        benchmarkAddRow("multiple-char", "ssg");
-        benchmarkAddRow("multiple-arrays", "asasay");
-
-        benchmarkAddRow("struct-missingclose", "(ayyyy");
-        benchmarkAddRow("longstruct", "(yyyyyyayasy)");
-        benchmarkAddRow("invalid-longstruct", "(yyyyyyayas.y)");
-        benchmarkAddRow("complexstruct", "(y(aasay)oga{sv})");
-        benchmarkAddRow("multiple-simple-structs", "(y)(y)(y)");
-    }
+    benchmarkAddRow("struct-missingclose", "(ayyyy");
+    benchmarkAddRow("longstruct", "(yyyyyyayasy)");
+    benchmarkAddRow("invalid-longstruct", "(yyyyyyayas.y)");
+    benchmarkAddRow("complexstruct", "(y(aasay)oga{sv})");
+    benchmarkAddRow("multiple-simple-structs", "(y)(y)(y)");
 }
 
 void tst_QDBusType::benchmarkSignature()