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

 Conflicts:
	src/plugins/platforms/ios/quiview.mm

Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412

3 files changed, 7 insertions, 1 deletions

diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index 109f5b77f6..482ed8d130 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -586,7 +586,6 @@ void tst_QEventLoop::deliverInDefinedOrder()
         }
     }
 
-    QTest::qWait(30);
     for (int o = 0; o < NbObject; o++) {
         QTRY_COMPARE(objects[o].count, int(NbEvent));
     }
diff --git a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
index d0a0225055..82197f815e 100644
--- a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
+++ b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp
@@ -372,6 +372,8 @@ namespace {
                 return "const";
             case QShaderLanguage::Input:
                 return "varying";
+            case QShaderLanguage::BuiltIn:
+                return "//";
             case QShaderLanguage::Output:
                 return ""; // Although fragment shaders for <=2 only have fixed outputs
             case QShaderLanguage::Uniform:
@@ -383,6 +385,8 @@ namespace {
                 return "const";
             case QShaderLanguage::Input:
                 return "in";
+            case QShaderLanguage::BuiltIn:
+                return "//";
             case QShaderLanguage::Output:
                 return "out";
             case QShaderLanguage::Uniform:
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index e26da6b93e..e39110bb50 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -471,6 +471,9 @@ void tst_QFiledialog::completer()
         for (int i = 0; i < 10; ++i) {
             TemporaryFilePtr file(new QTemporaryFile(startPath + QStringLiteral("/rXXXXXX")));
             QVERIFY2(file->open(), qPrintable(file->errorString()));
+            // Force the temporary file to materialize with the requested name
+            (void) file->fileName();
+            QVERIFY(file->exists());
             files.append(file);
         }
     }