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

Change-Id: Iab8e05beb7ede38bacaa35322d1f79cfc85cd470

10 files changed, 26 insertions, 10 deletions

diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index b24c05a37..4ff33dbac 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -205,7 +205,7 @@ void tst_QWebEngineCookieStore::basicFilter()
     QTRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QTRY_COMPARE(cookieAddedSpy.count(), 2);
-    QTRY_COMPARE(accessTested.loadAcquire(), 2);
+    QTRY_COMPARE(accessTested.loadAcquire(), 2); // FIXME?
 
     client->deleteAllCookies();
     QTRY_COMPARE(cookieRemovedSpy.count(), 2);
@@ -214,7 +214,7 @@ void tst_QWebEngineCookieStore::basicFilter()
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
     QTRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(accessTested.loadAcquire(), 4);
+    QTRY_COMPARE(accessTested.loadAcquire(), 4); // FIXME?
     // Test cookies are NOT added:
     QTest::qWait(100);
     QCOMPARE(cookieAddedSpy.count(), 2);
@@ -234,7 +234,7 @@ void tst_QWebEngineCookieStore::html5featureFilter()
 
     QTRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QCOMPARE(accessTested.loadAcquire(), 0);
+    QCOMPARE(accessTested.loadAcquire(), 0); // FIXME?
     QTest::ignoreMessage(QtCriticalMsg, QRegularExpression(".*Uncaught SecurityError.*sessionStorage.*"));
     page.runJavaScript("sessionStorage.test = 5;");
     QTRY_COMPARE(accessTested.loadAcquire(), 1);
diff --git a/tests/auto/quick/dialogs/BLACKLIST b/tests/auto/quick/dialogs/BLACKLIST
new file mode 100644
index 000000000..19380e01e
--- /dev/null
+++ b/tests/auto/quick/dialogs/BLACKLIST
@@ -0,0 +1,2 @@
+[authenticationDialogRequested:Proxy Authentication Dialog]
+*
diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
index 4becbb620..a671c2ec7 100644
--- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
+++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
@@ -98,7 +98,8 @@ TestWebEngineView {
 
             verify(dialog.webEngineView.waitForLoadSucceeded());
             compare(dialog.webEngineView.url, "");
-            compare(newViewRequest.requestedUrl, 'about:blank');
+            // https://chromium-review.googlesource.com/c/chromium/src/+/1300395
+            compare(newViewRequest.requestedUrl, 'about:blank#blocked');
             newViewRequestedSpy.clear();
             dialog.destroy();
 
@@ -129,8 +130,8 @@ TestWebEngineView {
             verify(webEngineView.waitForLoadSucceeded());
             verifyElementHasFocus("popupButton");
             keyPress(Qt.Key_Enter);
-            compare(newViewRequest.requestedUrl, url);
             tryCompare(newViewRequestedSpy, "count", 1);
+            compare(newViewRequest.requestedUrl, url);
 
             compare(newViewRequest.destination, WebEngineView.NewViewInDialog);
             verify(newViewRequest.userInitiated);
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 9817e7d6c..eb76be6db 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -1004,7 +1004,7 @@ void tst_QQuickWebEngineView::changeLocale()
     QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body").isNull());
     QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").isNull());
     errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts);
-    QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar Die Server-IP-Adresse von non.existent wurde nicht gefunden."));
+    QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
 
     QLocale::setDefault(QLocale("en"));
     QScopedPointer<QQuickWebEngineView> viewEN(newWebEngineView());
@@ -1014,7 +1014,7 @@ void tst_QQuickWebEngineView::changeLocale()
     QTRY_VERIFY(!evaluateJavaScriptSync(viewEN.data(), "document.body").isNull());
     QTRY_VERIFY(!evaluateJavaScriptSync(viewEN.data(), "document.body.innerText").isNull());
     errorLines = evaluateJavaScriptSync(viewEN.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts);
-    QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached non.existent\xE2\x80\x99s server IP address could not be found."));
+    QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached"));
 
     // Reset error page
     viewDE->setUrl(QUrl("about:blank"));
@@ -1027,7 +1027,7 @@ void tst_QQuickWebEngineView::changeLocale()
     QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body").isNull());
     QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").isNull());
     errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts);
-    QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar Die Server-IP-Adresse von non.existent wurde nicht gefunden."));
+    QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
 }
 
 void tst_QQuickWebEngineView::userScripts()
diff --git a/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST b/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST
new file mode 100644
index 000000000..a51117ae0
--- /dev/null
+++ b/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST
@@ -0,0 +1,2 @@
+[downloadToReadOnlyDir]
+windows
diff --git a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
index ee1e6ee04..8af559e21 100644
--- a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
+++ b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
@@ -919,6 +919,9 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilename()
 
 void tst_QWebEngineDownloadItem::downloadUniqueFileNameWithTimeStamp()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-74764: The download completes after the test fails thus would ruin subsequent tests on Windows.")
+#endif
     // Set up HTTP server
     QString baseName("test(1.test)");
     QString extension("txt");
diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST
index f3dc51fdd..e6d50da39 100644
--- a/tests/auto/widgets/qwebenginepage/BLACKLIST
+++ b/tests/auto/widgets/qwebenginepage/BLACKLIST
@@ -12,3 +12,6 @@ windows
 
 [getUserMediaRequestDesktopVideoManyRequests]
 windows
+
+[runJavaScriptFromSlot]
+osx
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index b0db4e974..8bd68bb97 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -60,7 +60,7 @@ private Q_SLOTS:
     void downloadItem();
     void changePersistentPath();
     void initiator();
-    void qtbug_72299(); // this should be the last test
+    void qtbug_71895(); // this should be the last test
 };
 
 void tst_QWebEngineProfile::init()
@@ -631,7 +631,7 @@ void tst_QWebEngineProfile::initiator()
     QCOMPARE(handler.initiator, QUrl());
 }
 
-void tst_QWebEngineProfile::qtbug_72299()
+void tst_QWebEngineProfile::qtbug_71895()
 {
     QWebEngineView view;
     view.setUrl(QUrl("https://www.qt.io"));
diff --git a/tests/auto/widgets/qwebenginescript/BLACKLIST b/tests/auto/widgets/qwebenginescript/BLACKLIST
new file mode 100644
index 000000000..b641aaf04
--- /dev/null
+++ b/tests/auto/widgets/qwebenginescript/BLACKLIST
@@ -0,0 +1,3 @@
+# FIXME post 72-merge
+[webChannelWithBadString]
+*
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index 15b3efd3b..c99640b4b 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -45,3 +45,5 @@ boot2qt: SUBDIRS -= accessibility defaultsurfaceformat devtools \
                     qwebengineview  \
                     qwebenginescript \
                     proxypac offscreen
+
+win32: SUBDIRS -= offscreen