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

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f

3 files changed, 49 insertions, 4 deletions

diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 946620d61f..da948849f6 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -2322,8 +2322,11 @@ void tst_QDir::cdBelowRoot()
 void tst_QDir::emptyDir()
 {
     const QString tempDir = QDir::currentPath() + "/tmpdir/";
-    QVERIFY(QDir().mkdir(tempDir));
-    QVERIFY(QDir(tempDir).mkdir("emptyDirectory"));
+    QDir temp(tempDir);
+    if (!temp.exists()) {
+        QVERIFY(QDir().mkdir(tempDir));
+    }
+    QVERIFY(temp.mkdir("emptyDirectory"));
 
     QDir testDir(tempDir + "emptyDirectory");
     QVERIFY(testDir.isEmpty());
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 6b1516600f..de6eb28503 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -94,6 +94,7 @@ private slots:
     void setEnvironment();
     void setProcessEnvironment_data();
     void setProcessEnvironment();
+    void environmentIsSorted();
     void spaceInName();
     void setStandardInputFile();
     void setStandardOutputFile_data();
@@ -1734,6 +1735,47 @@ void tst_QProcess::setProcessEnvironment()
     }
 }
 
+void tst_QProcess::environmentIsSorted()
+{
+    QProcessEnvironment env;
+    env.insert(QLatin1String("a"), QLatin1String("foo_a"));
+    env.insert(QLatin1String("B"), QLatin1String("foo_B"));
+    env.insert(QLatin1String("c"), QLatin1String("foo_c"));
+    env.insert(QLatin1String("D"), QLatin1String("foo_D"));
+    env.insert(QLatin1String("e"), QLatin1String("foo_e"));
+    env.insert(QLatin1String("F"), QLatin1String("foo_F"));
+    env.insert(QLatin1String("Path"), QLatin1String("foo_Path"));
+    env.insert(QLatin1String("SystemRoot"), QLatin1String("foo_SystemRoot"));
+
+    const QStringList envlist = env.toStringList();
+
+#ifdef Q_OS_WIN32
+    // The environment block passed to CreateProcess "[Requires that] All strings in the
+    // environment block must be sorted alphabetically by name. The sort is case-insensitive,
+    // Unicode order, without regard to locale."
+    // https://msdn.microsoft.com/en-us/library/windows/desktop/ms682009(v=vs.85).aspx
+    // So on Windows we sort that way.
+    const QStringList expected = { QLatin1String("a=foo_a"),
+                                   QLatin1String("B=foo_B"),
+                                   QLatin1String("c=foo_c"),
+                                   QLatin1String("D=foo_D"),
+                                   QLatin1String("e=foo_e"),
+                                   QLatin1String("F=foo_F"),
+                                   QLatin1String("Path=foo_Path"),
+                                   QLatin1String("SystemRoot=foo_SystemRoot") };
+#else
+    const QStringList expected = { QLatin1String("B=foo_B"),
+                                   QLatin1String("D=foo_D"),
+                                   QLatin1String("F=foo_F"),
+                                   QLatin1String("Path=foo_Path"),
+                                   QLatin1String("SystemRoot=foo_SystemRoot"),
+                                   QLatin1String("a=foo_a"),
+                                   QLatin1String("c=foo_c"),
+                                   QLatin1String("e=foo_e") };
+#endif
+    QCOMPARE(envlist, expected);
+}
+
 void tst_QProcess::systemEnvironment()
 {
     QVERIFY(!QProcess::systemEnvironment().isEmpty());
diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
index a39de3c4d5..7676b04a03 100644
--- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
+++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
@@ -1,13 +1,13 @@
 CONFIG += testcase
 TARGET = tst_qresourceengine
-load(resources)
+
 QT = core testlib
 SOURCES = tst_qresourceengine.cpp
 RESOURCES += testqrc/test.qrc
 
 runtime_resource.target = runtime_resource.rcc
 runtime_resource.depends = $$PWD/testqrc/test.qrc
-runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runtime_resource.depends} -o $${runtime_resource.target}
+runtime_resource.commands = $$[QT_INSTALL_BINS]/rcc -root /runtime_resource/ -binary $${runtime_resource.depends} -o $${runtime_resource.target}
 QMAKE_EXTRA_TARGETS = runtime_resource
 PRE_TARGETDEPS += $${runtime_resource.target}
 QMAKE_DISTCLEAN += $${runtime_resource.target}