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

Conflicts:
	examples/examples.pro
	tests/auto/corelib/tools/qchar/tst_qchar.cpp
	tests/auto/other/qaccessibility/accessiblewidgets.h

Change-Id: I426696c40ab57d14dc295b8103152cede79f244c

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index e1a999abfb..1cbb7ad19c 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -3071,7 +3071,11 @@ void tst_QUrl::fromUserInputWithCwd_data()
     }
 
     // Existing files
-    for (const char *fileName : {"file.txt", "file#a.txt", "file .txt", "file.txt "}) {
+    for (const char *fileName : {"file.txt", "file#a.txt", "file .txt", "file.txt "
+#ifndef Q_OS_WIN
+            , "file:colon.txt"
+#endif
+            }) {
         const QString filePath = base + '/' + fileName;
         QFile file(filePath);
         QVERIFY2(file.open(QIODevice::WriteOnly), qPrintable(filePath));