From 6501578643062c1eff8c7315565cfd9d991e71cd Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 16 Dec 2021 14:33:28 +0100
Subject: Stabilize tst_qwebengineurlrequestinterceptor

One of our macOS test machines has become remarkably slower recently.

Change-Id: I375c92f9c52054190a79d7793849f2783c98baa8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 4754121b79ae9129742d141bccf436cf9b30b986)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tst_qwebengineurlrequestinterceptor.cpp        | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 94669c4ca..14d045613 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -231,7 +231,7 @@ void tst_QWebEngineUrlRequestInterceptor::interceptRequest()
     QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
 
     page.load(QUrl("qrc:///resources/index.html"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
     loadSpy.clear();
@@ -247,7 +247,7 @@ void tst_QWebEngineUrlRequestInterceptor::interceptRequest()
 
     interceptor.shouldRedirect = true;
     page.load(QUrl("qrc:///resources/__placeholder__"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
     success = loadSpy.takeFirst().takeFirst();
     // The redirection for __placeholder__ should succeed.
     QVERIFY(success.toBool());
@@ -258,7 +258,7 @@ void tst_QWebEngineUrlRequestInterceptor::interceptRequest()
     TestRequestInterceptor observer(/* intercept */ false);
     profile.setUrlRequestInterceptor(&observer);
     page.load(QUrl("qrc:///resources/__placeholder__"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
     success = loadSpy.takeFirst().takeFirst();
     // Since we do not intercept, loading an invalid path should not succeed.
     QVERIFY(!success.toBool());
@@ -331,7 +331,7 @@ void tst_QWebEngineUrlRequestInterceptor::requestedUrl()
 
     page.setUrl(QUrl("qrc:///resources/__placeholder__"));
     QVERIFY(spy.wait());
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
     QVERIFY(interceptor.requestInfos.count() >= 1);
     QCOMPARE(interceptor.requestInfos.at(0).requestUrl, QUrl("qrc:///resources/content.html"));
     QCOMPARE(page.requestedUrl(), QUrl("qrc:///resources/__placeholder__"));
@@ -340,14 +340,14 @@ void tst_QWebEngineUrlRequestInterceptor::requestedUrl()
     interceptor.shouldRedirect = false;
 
     page.setUrl(QUrl("qrc:/non-existent.html"));
-    QTRY_COMPARE(spy.count(), 2);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 2, 20000);
     QVERIFY(interceptor.requestInfos.count() >= 3);
     QCOMPARE(interceptor.requestInfos.at(2).requestUrl, QUrl("qrc:/non-existent.html"));
     QCOMPARE(page.requestedUrl(), QUrl("qrc:///resources/__placeholder__"));
     QCOMPARE(page.url(), QUrl("qrc:///resources/content.html"));
 
     page.setUrl(QUrl("http://abcdef.abcdef"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 3, 15000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 3, 20000);
     QVERIFY(interceptor.requestInfos.count() >= 4);
     QCOMPARE(interceptor.requestInfos.at(3).requestUrl, QUrl("http://abcdef.abcdef/"));
     QCOMPARE(page.requestedUrl(), QUrl("qrc:///resources/__placeholder__"));
@@ -444,7 +444,7 @@ void tst_QWebEngineUrlRequestInterceptor::firstPartyUrlNestedIframes()
     QWebEnginePage page(&profile);
     QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
     page.setUrl(requestUrl);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
 
     QVERIFY(interceptor.requestInfos.count() >= 1);
     RequestInfo info = interceptor.requestInfos.at(0);
@@ -534,7 +534,7 @@ void tst_QWebEngineUrlRequestInterceptor::requestInterceptorByResourceType()
     QWebEnginePage page(&profile);
     QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
     page.setUrl(firstPartyUrl);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
 
     QTRY_COMPARE(interceptor.getUrlRequestForType(static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType)).count(), 1);
     QList<RequestInfo> infos = interceptor.getUrlRequestForType(static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType));
@@ -735,7 +735,7 @@ void tst_QWebEngineUrlRequestInterceptor::jsServiceWorker()
     QVERIFY(loadSync(page.get(), server.url("/sw.html")));
 
     // We expect only one message here, because logging of services workers is not exposed in our API.
-    QTRY_COMPARE(page->messages.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(page->messages.count(), 1, 20000);
     QCOMPARE(page->levels.at(0), QWebEnginePage::InfoMessageLevel);
 
     QUrl firstPartyUrl = QUrl(server.url().toString() + "sw.js");
@@ -804,7 +804,7 @@ void tst_QWebEngineUrlRequestInterceptor::replaceInterceptor()
     });
 
     page.setUrl(server.url("/favicon.html"));
-    QTRY_COMPARE(spy.count(), 2);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 2, 20000);
     QTRY_VERIFY(fetchFinished);
 
     QString s; QDebug d(&s);
@@ -848,7 +848,7 @@ void tst_QWebEngineUrlRequestInterceptor::replaceOnIntercept()
     };
 
     page.setUrl(server.url("/favicon.html"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
     QTRY_COMPARE(profileInterceptor.requestInfos.size(), 2);
 
     // if interceptor for page was replaced on intercept call in profile then, since request first
-- 
cgit v1.2.3


From 1c98e3bd74018d725a958605b21b664041d4e15a Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Sat, 11 Dec 2021 17:41:19 +0100
Subject: Stabilize tst_QWebEngineCookieStore

Centralize and increase the timeout for all QTRY_COMPARE and
QTRY_VERIFY to 30s.

Change-Id: I582b3694ede65890f2707b50a78d2970e11b3fe8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 2681f86b2b24440950ea5c254b3d2e2bf8d40688)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tst_qwebenginecookiestore.cpp                  | 92 +++++++++++-----------
 1 file changed, 48 insertions(+), 44 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index a712fb288..8b4f17a65 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -35,6 +35,10 @@
 #include "httpserver.h"
 #include "httpreqrep.h"
 
+// locally overwrite the default timeout of QTY_(COMPARE|VERIFY)
+#define QWE_TRY_COMPARE(x, y) QTRY_COMPARE_WITH_TIMEOUT(x, y, 30000)
+#define QWE_TRY_VERIFY(x) QTRY_VERIFY_WITH_TIMEOUT(x, 30000)
+
 class tst_QWebEngineCookieStore : public QObject
 {
     Q_OBJECT
@@ -104,22 +108,22 @@ void tst_QWebEngineCookieStore::cookieSignals()
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
 
     // try whether updating a cookie to be expired results in that cookie being removed.
     QNetworkCookie expiredCookie(QNetworkCookie::parseCookies(QByteArrayLiteral("SessionCookie=delete; expires=Thu, 01-Jan-1970 00:00:00 GMT; path=///resources")).first());
     client->setCookie(expiredCookie, QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
     cookieRemovedSpy.clear();
 
     // try removing the other cookie.
     QNetworkCookie nonSessionCookie(QNetworkCookie::parseCookies(QByteArrayLiteral("CookieWithExpiresField=QtWebEngineCookieTest; path=///resources")).first());
     client->deleteCookie(nonSessionCookie, QUrl("qrc:///resources/index.html"));
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
 }
 
 void tst_QWebEngineCookieStore::setAndDeleteCookie()
@@ -140,33 +144,33 @@ void tst_QWebEngineCookieStore::setAndDeleteCookie()
     client->loadAllCookies();
     // /* FIXME remove 'blank' navigation once loadAllCookies api is fixed
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     // */
 
     // check if pending cookies are set and removed
     client->setCookie(cookie1);
     client->setCookie(cookie2);
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
     client->deleteCookie(cookie1);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
 
     page.load(QUrl("qrc:///resources/content.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 2);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
     cookieAddedSpy.clear();
     cookieRemovedSpy.clear();
 
     client->setCookie(cookie3);
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
     // updating a cookie with an expired 'expires' field should remove the cookie with the same name
     client->setCookie(expiredCookie3);
     client->deleteCookie(cookie2);
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 2);
 }
 
 void tst_QWebEngineCookieStore::batchCookieTasks()
@@ -185,29 +189,29 @@ void tst_QWebEngineCookieStore::batchCookieTasks()
     client->loadAllCookies();
     // /* FIXME remove 'blank' navigation once loadAllCookies api is fixed
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     // */
 
     client->setCookie(cookie1);
     client->setCookie(cookie2);
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 2);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 4);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 0);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 4);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 0);
 
     cookieAddedSpy.clear();
     cookieRemovedSpy.clear();
 
     client->deleteSessionCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 3);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 3);
 
     client->deleteAllCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 4);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 4);
 }
 
 void tst_QWebEngineCookieStore::basicFilter()
@@ -224,19 +228,19 @@ void tst_QWebEngineCookieStore::basicFilter()
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
-    QTRY_COMPARE(accessTested.loadAcquire(), 2); // FIXME?
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 2); // FIXME?
 
     client->deleteAllCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 2);
 
     client->setCookieFilter([&](const QWebEngineCookieStore::FilterRequest &){ ++accessTested; return false; });
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(accessTested.loadAcquire(), 4); // FIXME?
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 4); // FIXME?
     // Test cookies are NOT added:
     QTest::qWait(100);
     QCOMPARE(cookieAddedSpy.count(), 2);
@@ -280,25 +284,25 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
     QUrl firstPartyUrl = httpServer.url("/test.html");
     page.load(firstPartyUrl);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(accessTested.loadAcquire(), 4);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 4);
     QVERIFY(cookieRequestHeader.isEmpty());
 
-    QTRY_COMPARE(serverSpy.count(), 3);
+    QWE_TRY_COMPARE(serverSpy.count(), 3);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(!cookieRequestHeader.isEmpty());
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(accessTested.loadAcquire(), 6);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 6);
 
-    QTRY_COMPARE(serverSpy.count(), 5);
+    QWE_TRY_COMPARE(serverSpy.count(), 5);
 
     client->deleteAllCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
 
     client->setCookieFilter([&](const QWebEngineCookieStore::FilterRequest &request) {
         resourceFirstParty.append(qMakePair(request.origin, request.firstPartyUrl));
@@ -306,24 +310,24 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
         return false;
     });
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(cookieRequestHeader.isEmpty());
     // Test cookies are NOT added:
     QTest::qWait(100);
     QCOMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(accessTested.loadAcquire(), 9);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 9);
 
-    QTRY_COMPARE(serverSpy.count(), 7);
+    QWE_TRY_COMPARE(serverSpy.count(), 7);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(cookieRequestHeader.isEmpty());
     QCOMPARE(cookieAddedSpy.count(), 1);
 
     // Wait for last GET /favicon.ico
-    QTRY_COMPARE(serverSpy.count(), 9);
+    QWE_TRY_COMPARE(serverSpy.count(), 9);
     (void) httpServer.stop();
 
     QCOMPARE(resourceFirstParty.size(), accessTested.loadAcquire());
@@ -344,17 +348,17 @@ void tst_QWebEngineCookieStore::html5featureFilter()
 
     page.load(QUrl("qrc:///resources/content.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QCOMPARE(accessTested.loadAcquire(), 0); // FIXME?
     QTest::ignoreMessage(QtCriticalMsg, QRegularExpression(".*Uncaught SecurityError.*sessionStorage.*"));
     page.runJavaScript("sessionStorage.test = 5;");
-    QTRY_COMPARE(accessTested.loadAcquire(), 1);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 1);
 
     QTest::ignoreMessage(QtCriticalMsg, QRegularExpression(".*Uncaught SecurityError.*sessionStorage.*"));
     QAtomicInt callbackTriggered = 0;
     page.runJavaScript("sessionStorage.test", [&](const QVariant &v) { QVERIFY(!v.isValid()); callbackTriggered = 1; });
-    QTRY_VERIFY(callbackTriggered);
+    QWE_TRY_VERIFY(callbackTriggered);
 }
 
 QTEST_MAIN(tst_QWebEngineCookieStore)
-- 
cgit v1.2.3


From 30113ef46fbeb2a063df29ec3ef14bdb0d22fc5b Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Sun, 19 Dec 2021 20:32:46 +0100
Subject: Blacklist failing tests on macos

Seems to have started failing while the team is on holiday

Change-Id: Id47f5c328ae105305c883f9ce00fea36199830d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 4b6d5daf527a565bd659668d63a1d14fad0acb27)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebenginepage/BLACKLIST | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST
index 0c84b8de1..7eb97b3bb 100644
--- a/tests/auto/widgets/qwebenginepage/BLACKLIST
+++ b/tests/auto/widgets/qwebenginepage/BLACKLIST
@@ -7,3 +7,9 @@ macos # Can't move cursor (QTBUG-76312)
 
 [acceptNavigationRequestNavigationType]
 b2qt arm
+
+[comboBoxPopupPositionAfterMove]
+macos
+
+[comboBoxPopupPositionAfterChildMove]
+macos
-- 
cgit v1.2.3


From bc9677e43afd9a566cce08420c86ac322fb81259 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 22 Dec 2021 11:24:09 +0100
Subject: Increase timeout to help slow CI

Change-Id: I5f0dd43e0c1eb6bc43f263227b12ec0e1b9f7a20
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 4cc4f765a9cfc11668c6274dfe77153a68ff1ec5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 7b85c7348..8aa88b34d 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -121,7 +121,7 @@ void tst_InspectorServer::testPageList()
                                                  + QLatin1String("/html/basic_page.html"));
     QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webView()->setUrl(testPageUrl);
-    QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
+    QTRY_VERIFY_WITH_TIMEOUT(loadSpy.size() && !webView()->isLoading(), 10000);
 
     // Our page has developerExtrasEnabled and should be the only one in the list.
     QJsonArray pageList = fetchPageList();
@@ -135,7 +135,7 @@ void tst_InspectorServer::testRemoteDebuggingMessage()
                                                  + QLatin1String("/html/basic_page.html"));
     QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webView()->setUrl(testPageUrl);
-    QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
+    QTRY_VERIFY_WITH_TIMEOUT(loadSpy.size() && !webView()->isLoading(), 10000);
 
     QJsonArray pageList = fetchPageList();
     QCOMPARE(pageList.size(), 1);
@@ -170,7 +170,7 @@ void tst_InspectorServer::openRemoteDebuggingSession()
                                                  + QLatin1String("/html/basic_page.html"));
     QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webView()->setUrl(testPageUrl);
-    QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
+    QTRY_VERIFY_WITH_TIMEOUT(loadSpy.size() && !webView()->isLoading(), 10000);
 
     QJsonArray pageList = fetchPageList();
     QCOMPARE(pageList.size(), 1);
-- 
cgit v1.2.3


From 594c8595553ec302a3852e6bf55425023c5897c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Wed, 22 Dec 2021 00:58:52 +0100
Subject: Blacklist tst_InspectorServer::openRemoteDebuggingSession

It is causing trouble on some (more) platforms. Might be a
regression in qtdeclarative.

Change-Id: If0195abe085f1f4cf59864fa89c9611da4f213ec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/quick/inspectorserver/BLACKLIST | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/quick/inspectorserver/BLACKLIST b/tests/auto/quick/inspectorserver/BLACKLIST
index 076dd5f10..318dae7a5 100644
--- a/tests/auto/quick/inspectorserver/BLACKLIST
+++ b/tests/auto/quick/inspectorserver/BLACKLIST
@@ -1,2 +1,2 @@
 [openRemoteDebuggingSession]
-macos
+*
-- 
cgit v1.2.3


From 387a5ee0c35364f6b4c9ce3bd3d50f5b825626ca Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Tue, 30 Nov 2021 13:01:39 +0100
Subject: Cleanup code and clang build warnings

Fix build noise as reported by clang for issues like api deprecation,
unused variables, sign/unsigned mismatch and other non critical issues.

Change-Id: I4fba25406eea8170e3283c42e908ae86bd512e3a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 02d58a067fb5f0db32c254e783170f9f283aeb9d)
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 tests/auto/core/origins/tst_origins.cpp               |  5 +++--
 tests/auto/quick/qmltests/tst_qmltests.cpp            | 19 +++++++------------
 .../widgets/qwebenginescript/tst_qwebenginescript.cpp |  2 +-
 .../widgets/qwebengineview/tst_qwebengineview.cpp     |  6 +++---
 4 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index ac937037f..1731bee8a 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -200,8 +200,9 @@ private:
         if (url.path().startsWith("/qtwebchannel/"))
             pathPrefix = QSL(":");
         QString pathSuffix = url.path();
-        QFile *file = new QFile(pathPrefix + pathSuffix, job);
+        auto file = std::make_unique<QFile>(pathPrefix + pathSuffix, job);
         if (!file->open(QIODevice::ReadOnly)) {
+            qWarning() << "Failed to read data for:" << url << file->errorString();
             job->fail(QWebEngineUrlRequestJob::RequestFailed);
             return;
         }
@@ -210,7 +211,7 @@ private:
             mimeType = QBAL("application/javascript");
         else if (pathSuffix.endsWith(QSL(".css")))
             mimeType = QBAL("text/css");
-        job->reply(mimeType, file);
+        job->reply(mimeType, file.release());
     }
 
     QList<QUrl> m_requests;
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 00c6478e9..967cabfec 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -251,22 +251,17 @@ int main(int argc, char **argv)
 
     sigaction(SIGSEGV, &sigAction, 0);
 #endif
-    QScopedPointer<Application> app;
+    QtWebEngineQuick::initialize();
     // Force to use English language for testing due to error message checks
     QLocale::setDefault(QLocale("en"));
 
     static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
-    QList<const char *> w_argv(argc); \
-    for (int i = 0; i < argc; ++i) \
-        w_argv[i] = argv[i]; \
-    for (int i = 0; i < params.size(); ++i) \
-        w_argv.append(params[i].data()); \
-    int w_argc = w_argv.size(); \
-
-    if (!QCoreApplication::instance()) {
-        app.reset(new Application(w_argc, const_cast<char **>(w_argv.data())));
-    }
-    QtWebEngineQuick::initialize();
+    QList<const char *> w_argv(argc);
+    for (int i = 0; i < argc; ++i) w_argv[i] = argv[i];
+    for (int i = 0; i < params.size(); ++i) w_argv.append(params[i].data());
+    int w_argc = w_argv.size();
+    Application app(w_argc, const_cast<char **>(w_argv.data()));
+
     QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
     qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir");
     qmlRegisterType<TestInputContext>("Test.util", 1, 0, "TestInputContext");
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 5df9f035f..26ba71ae3 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -218,7 +218,7 @@ void tst_QWebEngineScript::loadEvents()
     // Using window.open from JS
     QVERIFY(profile.pages.size() == 1);
     page.load(QUrl("qrc:/resources/test_window_open.html"));
-    QTRY_COMPARE(profile.pages.size(), 2);
+    QTRY_COMPARE(profile.pages.size(), 2u);
     QTRY_COMPARE(profile.pages.front().spy.count(), 1);
     QTRY_COMPARE(profile.pages.back().spy.count(), 1);
     QVERIFY(verifyOrder(profile.pages.front().eval("window.log", QWebEngineScript::MainWorld).toStringList()));
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index d6a945e65..bbd1fbd16 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -592,6 +592,7 @@ void tst_QWebEngineView::focusInputTypes()
 
 class KeyEventRecordingWidget : public QWidget {
 public:
+    ~KeyEventRecordingWidget() { qDeleteAll(pressEvents); qDeleteAll(releaseEvents); }
     QList<QKeyEvent *> pressEvents;
     QList<QKeyEvent *> releaseEvents;
     void keyPressEvent(QKeyEvent *e) override { pressEvents << e->clone(); }
@@ -1676,11 +1677,10 @@ void tst_QWebEngineView::postData()
 
 void tst_QWebEngineView::inputFieldOverridesShortcuts()
 {
+    QWebEngineView view;
     bool actionTriggered = false;
-    QAction *action = new QAction;
+    QAction *action = new QAction(&view);
     connect(action, &QAction::triggered, [&actionTriggered] () { actionTriggered = true; });
-
-    QWebEngineView view;
     view.addAction(action);
 
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
-- 
cgit v1.2.3


From 90983b3b673f0af1d862051c542bcb56387eee87 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Tue, 14 Dec 2021 10:58:59 +0100
Subject: QtPdf: add a very rudimentary test for QPdfSelection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... as part of tst_QPdfDocument.

The smaller QtPdf classes should probably all have their own
tests. The existing tests are far from being sufficient.

Change-Id: I01ff2b7abbdbe43ee596d682c256001539fde1bf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 154cb38a7744c1cb46e9c2194c696724936beacd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp | 36 ++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
index 24c4e988d..a0f73bb88 100644
--- a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
+++ b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
@@ -69,12 +69,23 @@ private slots:
     void status();
     void passwordClearedOnClose();
     void metaData();
+
+private:
+    void consistencyCheck(QPdfDocument &doc) const;
 };
 
 struct TemporaryPdf: public QTemporaryFile
 {
     TemporaryPdf();
     QPageLayout pageLayout;
+
+    static QString pageText(int page) {
+        switch (page) {
+        case 0: return QStringLiteral("Hello Page 1");
+        case 1: return QStringLiteral("Hello Page 2");
+        default: return {};
+        }
+    }
 };
 
 
@@ -91,9 +102,9 @@ TemporaryPdf::TemporaryPdf()
 
         {
             QPainter painter(&printer);
-            painter.drawText(100, 100, QStringLiteral("Hello Page 1"));
+            painter.drawText(100, 100, pageText(0));
             printer.newPage();
-            painter.drawText(100, 100, QStringLiteral("Hello Page 2"));
+            painter.drawText(100, 100, pageText(1));
         }
     }
 
@@ -130,6 +141,19 @@ void tst_QPdfDocument::loadFromIODevice()
     QCOMPARE(doc.pageCount(), 2);
     QCOMPARE(pageCountChangedSpy.count(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
+
+    consistencyCheck(doc);
+}
+
+void tst_QPdfDocument::consistencyCheck(QPdfDocument &doc) const
+{
+    for (int i = 0; i < doc.pageCount(); ++i) {
+        const QString expected = TemporaryPdf::pageText(i);
+        QPdfSelection page = doc.getAllText(i);
+        QCOMPARE(page.text(), expected);
+        auto pageMoved = std::move(page);
+        QCOMPARE(pageMoved.text(), expected);
+    }
 }
 
 void tst_QPdfDocument::loadAsync()
@@ -153,6 +177,8 @@ void tst_QPdfDocument::loadAsync()
     QCOMPARE(doc.pageCount(), 2);
     QCOMPARE(pageCountChangedSpy.count(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
+
+    consistencyCheck(doc);
 }
 
 void tst_QPdfDocument::password()
@@ -192,6 +218,10 @@ void tst_QPdfDocument::close()
     statusChangedSpy.clear();
     pageCountChangedSpy.clear();
 
+    consistencyCheck(doc);
+    if (QTest::currentTestFailed())
+        return;
+
     doc.close();
     QCOMPARE(statusChangedSpy.count(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Unloading);
@@ -235,6 +265,8 @@ void tst_QPdfDocument::loadAfterClose()
     QCOMPARE(doc.pageCount(), 2);
     QCOMPARE(pageCountChangedSpy.count(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
+
+    consistencyCheck(doc);
 }
 
 void tst_QPdfDocument::closeOnDestroy()
-- 
cgit v1.2.3


From bcb7ab3412275f97d71baa819c1f715a8e225bf1 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 5 Jan 2022 14:30:32 +0100
Subject: Add objectName to webengine accessibility objects

This requires adding a QObject to represent the backing node.

Fixes: QTBUG-99485
Change-Id: I4d8c722a0dfb1f374995f3feab23b93ed5d8752a
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit d95f6a6b23e3052c39a32f50d6e604cf17e698e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../widgets/accessibility/tst_accessibility.cpp    | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 054559f13..4429ff8bf 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -48,6 +48,8 @@ private Q_SLOTS:
     void value();
     void roles_data();
     void roles();
+    void objectName();
+    void crossTreeParent();
 };
 
 // This will be called before the first test function is executed.
@@ -552,6 +554,57 @@ void tst_Accessibility::roles()
     QCOMPARE(element->role(), role);
 }
 
+void tst_Accessibility::objectName()
+{
+    QWebEngineView webView;
+    QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished);
+    webView.setHtml("<html><body><p id='my_id'></p></body></html>");
+    webView.show();
+    QVERIFY(spyFinished.wait());
+    QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
+    QAccessibleInterface *document = view->child(0);
+    QTRY_COMPARE(document->childCount(), 1);
+    QAccessibleInterface *p = document->child(0);
+    QVERIFY(p);
+    QVERIFY(p->object());
+    QCOMPARE(p->role(), QAccessible::Paragraph);
+    QCOMPARE(p->object()->objectName(), QStringLiteral("my_id"));
+}
+
+void tst_Accessibility::crossTreeParent()
+{
+    QWebEngineView webView;
+    QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished);
+    webView.setHtml("<html><body><iframe src='data:text/html,<html><body><p id=my_id></p></body></html>'>Fallback text</iframe></body></html>");
+    webView.show();
+    QVERIFY(spyFinished.wait());
+    QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
+    QAccessibleInterface *document = view->child(0);
+    QCOMPARE(document->role(), QAccessible::WebDocument);
+    QTRY_COMPARE(document->childCount(), 1);
+    QAccessibleInterface *p = document->child(0);
+    QVERIFY(p);
+    QCOMPARE(p->parent(), document);
+    p = p->child(0);
+    QVERIFY(p);
+    QCOMPARE(p->role(), QAccessible::WebDocument);
+    QCOMPARE(p->parent()->parent(), document);
+    QTRY_COMPARE(p->childCount(), 1);
+    p = p->child(0);
+    QVERIFY(p);
+    QAccessibleInterface *subdocument = p;
+    QCOMPARE(p->role(), QAccessible::WebDocument);
+    QCOMPARE(p->parent()->parent()->parent(), document);
+    p = p->child(0);
+    QVERIFY(p);
+    QVERIFY(p->object());
+    QCOMPARE(p->role(), QAccessible::Paragraph);
+    QCOMPARE(p->parent(), subdocument);
+    QCOMPARE(p->parent()->parent()->parent()->parent(), document);
+    QCOMPARE(p->parent()->parent()->parent()->parent()->parent(), view);
+    QCOMPARE(p->object()->objectName(), QStringLiteral("my_id"));
+}
+
 static QByteArrayList params = QByteArrayList()
     << "--force-renderer-accessibility"
     << "--enable-features=AccessibilityExposeARIAAnnotations";
-- 
cgit v1.2.3


From 077c5dcb7088b694cdc03b21bb7201a46b12ce43 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Wed, 17 Nov 2021 15:08:14 +0100
Subject: Widgets: Add FileSelectionMode::FileSelectSave

Now we have an example to trigger this type of dialog, we can
expose this as public API.

Change-Id: If0964d07a532daaff5e798dac63dc02ec7781d4d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 99b46c0959ec6280ee51c0d9ef8df432fd96a5bc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index c86e89b42..d95c246fc 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -4758,6 +4758,8 @@ void tst_QWebEnginePage::testChooseFilesParameters_data()
                                           << QWebEnginePage::FileSelectOpenMultiple << QStringList();
     QTest::addRow("Folder upload") << QString("multiple webkitdirectory") << QString()
                                    << QWebEnginePage::FileSelectUploadFolder << QStringList();
+    QTest::addRow("Save file") << QString("") << QString()
+                                   << QWebEnginePage::FileSelectSave << QStringList();
     mimeTypes = QStringList() << "audio/*";
     QTest::addRow("MIME type: audio") << QString() << QString("accept='%1'").arg(mimeTypes.join(','))
                                       << QWebEnginePage::FileSelectOpen << mimeTypes;
@@ -4791,9 +4793,16 @@ void tst_QWebEnginePage::testChooseFilesParameters()
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
-    page.setHtml(QString("<html><body>"
-                         "<input id='filePicker' type='file' name='filePicker' %1 %2 />"
-                         "</body></html>").arg(uploadAttribute, mimeTypeAttribute));
+    if (expectedFileSelectionMode != QWebEnginePage::FileSelectSave) {
+        page.setHtml(QString("<html><body>"
+                             "<input id='filePicker' type='file' name='filePicker' %1 %2 />"
+                             "</body></html>").arg(uploadAttribute, mimeTypeAttribute));
+    } else {
+        page.setHtml(QString("<html><body>"
+                             "<button id='filePicker' value='trigger' "
+                             "onclick='window.showSaveFilePicker()'"
+                             "</body></html>"), QString("qrc:/"));
+    }
     QVERIFY(spyFinished.wait());
     QTRY_COMPARE(spyFinished.count(), 1);
 
-- 
cgit v1.2.3


From 034a84d0507a486970bf9ebee18912b319eff7cb Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 7 Oct 2021 13:54:14 +0200
Subject: Improve local scheme access rules

Task-number: QTBUG-96849
Change-Id: Ieb24da12a61e5e37b29ccf2d1a11b7bd863b842e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 3071de1e07be28d763164a037d946281146bf31d)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../auto/core/origins/resources/mixedSchemes.html  |   2 +-
 .../core/origins/resources/mixedSchemes_frame.html |   1 +
 tests/auto/core/origins/tst_origins.cpp            | 351 +++++++++++++++++----
 tests/auto/httpserver/httpserver.cpp               |   1 +
 4 files changed, 292 insertions(+), 63 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/origins/resources/mixedSchemes.html b/tests/auto/core/origins/resources/mixedSchemes.html
index c73e9ecdc..260372a29 100644
--- a/tests/auto/core/origins/resources/mixedSchemes.html
+++ b/tests/auto/core/origins/resources/mixedSchemes.html
@@ -12,7 +12,7 @@
              document.getElementById("iframe").setAttribute("src", url);
              // Early fire is OK unless the test is expecting cannotLoad.
              // If timeout is too short then a false positive is possible.
-             setTimeout(() => { result = result || "cannotLoad"; }, 500);
+             setTimeout(() => { result = result || "cannotLoad"; }, 1000);
          }
 
          addEventListener("load", function() {
diff --git a/tests/auto/core/origins/resources/mixedSchemes_frame.html b/tests/auto/core/origins/resources/mixedSchemes_frame.html
index 00c20ba37..40ace2d2f 100644
--- a/tests/auto/core/origins/resources/mixedSchemes_frame.html
+++ b/tests/auto/core/origins/resources/mixedSchemes_frame.html
@@ -3,6 +3,7 @@
     <head>
         <title>Mixed - Frame</title>
         <script>
+         console.log('Frame Loaded');
          var canary = true;
          parent.canary = true;
         </script>
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 1731bee8a..ce670991a 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -141,8 +141,18 @@ void registerSchemes()
         scheme.setFlags(QWebEngineUrlScheme::CorsEnabled);
         QWebEngineUrlScheme::registerScheme(scheme);
     }
+    {
+        QWebEngineUrlScheme scheme(QBAL("localaccess"));
+        scheme.setFlags(QWebEngineUrlScheme::LocalAccessAllowed);
+        QWebEngineUrlScheme::registerScheme(scheme);
+    }
     {
         QWebEngineUrlScheme scheme(QBAL("local"));
+        scheme.setFlags(QWebEngineUrlScheme::LocalScheme);
+        QWebEngineUrlScheme::registerScheme(scheme);
+    }
+    {
+        QWebEngineUrlScheme scheme(QBAL("local-localaccess"));
         scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed);
         QWebEngineUrlScheme::registerScheme(scheme);
     }
@@ -178,7 +188,9 @@ public:
         profile->installUrlSchemeHandler(QBAL("redirect1"), this);
         profile->installUrlSchemeHandler(QBAL("redirect2"), this);
         profile->installUrlSchemeHandler(QBAL("cors"), this);
+        profile->installUrlSchemeHandler(QBAL("localaccess"), this);
         profile->installUrlSchemeHandler(QBAL("local"), this);
+        profile->installUrlSchemeHandler(QBAL("local-localaccess"), this);
         profile->installUrlSchemeHandler(QBAL("local-cors"), this);
     }
 
@@ -217,6 +229,21 @@ private:
     QList<QUrl> m_requests;
 };
 
+class TestPage : public QWebEnginePage
+{
+public:
+    TestPage(QWebEngineProfile *profile) : QWebEnginePage(profile, nullptr)
+    {
+    }
+    void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel,
+                                  const QString &message, int,
+                                  const QString &) override
+    {
+        messages << message;
+    }
+    QStringList messages;
+};
+
 class tst_Origins final : public QObject {
     Q_OBJECT
 
@@ -237,6 +264,8 @@ private Q_SLOTS:
     void mixedSchemesWithCsp();
     void mixedXHR_data();
     void mixedXHR();
+    void mixedContent_data();
+    void mixedContent();
 #if defined(WEBSOCKETS)
     void webSocket();
 #endif
@@ -262,7 +291,7 @@ private:
     }
 
     QWebEngineProfile m_profile;
-    QWebEnginePage *m_page = nullptr;
+    TestPage *m_page = nullptr;
     TstUrlSchemeHandler *m_handler = nullptr;
 };
 
@@ -283,7 +312,7 @@ void tst_Origins::cleanupTestCase()
 
 void tst_Origins::init()
 {
-    m_page = new QWebEnginePage(&m_profile, nullptr);
+    m_page = new TestPage(&m_profile);
 }
 
 void tst_Origins::cleanup()
@@ -501,8 +530,6 @@ void tst_Origins::subdirWithoutAccess()
 {
     ScopedAttribute sa(m_page->settings(), QWebEngineSettings::LocalContentCanAccessFileUrls, false);
 
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     QVERIFY(verifyLoad("file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
                        + "/resources/subdir/index.html"));
     QCOMPARE(eval(QSL("msg[0]")), QVariant());
@@ -532,9 +559,8 @@ void tst_Origins::fileAccessRemoteUrl()
     server.setResourceDirs({ QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + "/resources" });
     QVERIFY(server.start());
 
-    ScopedAttribute sa(m_page->settings(), QWebEngineSettings::LocalContentCanAccessRemoteUrls, EnableAccess);
-    if (!EnableAccess)
-        QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("blocked by CORS policy")));
+    ScopedAttribute sa1(m_page->settings(), QWebEngineSettings::LocalContentCanAccessRemoteUrls, EnableAccess);
+    ScopedAttribute sa2(m_page->settings(), QWebEngineSettings::ErrorPageEnabled, false);
 
     QVERIFY(verifyLoad("file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
                        + "/resources/mixedXHR.html"));
@@ -553,35 +579,31 @@ void tst_Origins::fileAccessRemoteUrl()
 // file: scheme.
 void tst_Origins::mixedSchemes()
 {
+    ScopedAttribute sa(m_page->settings(), QWebEngineSettings::ErrorPageEnabled, false);
+
     QVERIFY(verifyLoad("file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
                        + "/resources/mixedSchemes.html"));
     eval("setIFrameUrl('file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
          + "/resources/mixedSchemes_frame.html')");
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('qrc:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('tst:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
 
     QVERIFY(verifyLoad(QSL("qrc:/resources/mixedSchemes.html")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Not allowed to load local resource")));
     eval("setIFrameUrl('file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
          + "/resources/mixedSchemes_frame.html')");
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
     eval(QSL("setIFrameUrl('qrc:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('tst:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 
     QVERIFY(verifyLoad(QSL("tst:/resources/mixedSchemes.html")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Not allowed to load local resource")));
     eval("setIFrameUrl('file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
          + "/resources/mixedSchemes_frame.html')");
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('qrc:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
     eval(QSL("setIFrameUrl('tst:/resources/mixedSchemes_frame.html')"));
@@ -590,66 +612,68 @@ void tst_Origins::mixedSchemes()
     QVERIFY(verifyLoad(QSL("PathSyntax:/resources/mixedSchemes.html")));
     eval(QSL("setIFrameUrl('PathSyntax:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Not allowed to load local resource")));
     eval(QSL("setIFrameUrl('PathSyntax-Local:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
     eval(QSL("setIFrameUrl('PathSyntax-LocalAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax-NoAccessAllowed:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 
     QVERIFY(verifyLoad(QSL("PathSyntax-LocalAccessAllowed:/resources/mixedSchemes.html")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax-Local:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
     eval(QSL("setIFrameUrl('PathSyntax-LocalAccessAllowed:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax-NoAccessAllowed:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 
     QVERIFY(verifyLoad(QSL("PathSyntax-NoAccessAllowed:/resources/mixedSchemes.html")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Not allowed to load local resource")));
     eval(QSL("setIFrameUrl('PathSyntax-Local:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax-LocalAccessAllowed:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('PathSyntax-NoAccessAllowed:/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 
     QVERIFY(verifyLoad(QSL("HostSyntax://a/resources/mixedSchemes.html")));
     eval(QSL("setIFrameUrl('HostSyntax://a/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('HostSyntax://b/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+
+    QVERIFY(verifyLoad(QSL("local-localaccess:/resources/mixedSchemes.html")));
+    eval("setIFrameUrl('local-cors:/resources/mixedSchemes_frame.html')");
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+    eval(QSL("setIFrameUrl('local-localaccess:/resources/mixedSchemes_frame.html')"));
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
+    eval(QSL("setIFrameUrl('local:/resources/mixedSchemes_frame.html')"));
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+
+    QVERIFY(verifyLoad(QSL("local-cors:/resources/mixedSchemes.html")));
+    eval("setIFrameUrl('local:/resources/mixedSchemes_frame.html')");
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+    eval(QSL("setIFrameUrl('local-cors:/resources/mixedSchemes_frame.html')"));
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
+    eval(QSL("setIFrameUrl('local:/resources/mixedSchemes_frame.html')"));
+    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 }
 
 // Like mixedSchemes but adds a Content-Security-Policy: frame-src 'none' header.
 void tst_Origins::mixedSchemesWithCsp()
 {
     QVERIFY(verifyLoad(QSL("HostSyntax://a/resources/mixedSchemesWithCsp.html")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("violates the following Content Security Policy")));
     eval(QSL("setIFrameUrl('HostSyntax://a/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("violates the following Content Security Policy")));
     eval(QSL("setIFrameUrl('HostSyntax://b/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 
     QVERIFY(verifyLoad(QSL("HostSyntax-ContentSecurityPolicyIgnored://a/resources/mixedSchemesWithCsp.html")));
     eval(QSL("setIFrameUrl('HostSyntax-ContentSecurityPolicyIgnored://a/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    QTest::ignoreMessage(QtSystemMsg, QRegularExpression(QSL("Uncaught SecurityError")));
     eval(QSL("setIFrameUrl('HostSyntax-ContentSecurityPolicyIgnored://b/resources/mixedSchemes_frame.html')"));
     QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
 }
@@ -683,55 +707,90 @@ void tst_Origins::mixedXHR_data()
         std::pair<const char *, std::vector<
             std::pair<const char *, std::vector<QVariant>>>>> data = {
         { "file", {
-            { "file",       {  OK,  OK, ERR,  OK } },
-            { "qrc",        { ERR, ERR, ERR, ERR } },
-            { "tst",        { ERR, ERR, ERR, ERR } },
-            { "data",       {  OK,  OK,  OK,  OK } },
-            { "cors",       { ERR,  OK, ERR,  OK } },
-            { "local",      { ERR, ERR, ERR, ERR } },
-            { "local-cors", {  OK,  OK,  OK,  OK } }, } },
+            { "file",               {  OK,  OK, ERR, ERR } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK, ERR, ERR } },
+            { "local-cors",         {  OK,  OK, ERR, ERR } }, } },
 
         { "qrc",  {
-            { "file",       { ERR, ERR, ERR, ERR } },
-            { "qrc",        {  OK,  OK,  OK,  OK } },
-            { "tst",        { ERR, ERR, ERR, ERR } },
-            { "data",       {  OK,  OK,  OK,  OK } },
-            { "cors",       {  OK,  OK,  OK,  OK } },
-            { "local",      { ERR, ERR, ERR, ERR } },
-            { "local-cors", { ERR, ERR, ERR, ERR } }, } },
+            { "file",               { ERR, ERR, ERR, ERR } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  { ERR, ERR, ERR, ERR } },
+            { "local-cors",         { ERR, ERR, ERR, ERR } }, } },
 
         { "tst",  {
-            { "file",       { ERR, ERR, ERR, ERR } },
-            { "qrc",        { ERR, ERR, ERR, ERR } },
-            { "tst",        {  OK,  OK,  OK,  OK } },
-            { "data",       {  OK,  OK,  OK,  OK } },
-            { "cors",       {  OK,  OK,  OK,  OK } },
-            { "local",      { ERR, ERR, ERR, ERR } },
-            { "local-cors", { ERR, ERR, ERR, ERR } }, } },
-
-        { "local", {
-            { "file",       { ERR, ERR, ERR, ERR } },
-            { "qrc",        { ERR, ERR, ERR, ERR } },
-            { "tst",        { ERR, ERR, ERR, ERR } },
-            { "data",       {  OK,  OK,  OK,  OK } },
-            { "cors",       { ERR,  OK, ERR,  OK } },
-            { "local",      {  OK,  OK, ERR,  OK } },
-            { "local-cors", {  OK,  OK,  OK,  OK } }, } },
+            { "file",               { ERR, ERR, ERR, ERR } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                {  OK,  OK,  OK,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  { ERR, ERR, ERR, ERR } },
+            { "local-cors",         { ERR, ERR, ERR, ERR } }, } },
+
+        { "cors", {                 // -local +cors -local-access
+            { "file",               { ERR, ERR, ERR, ERR } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  { ERR, ERR, ERR, ERR } },
+            { "local-cors",         { ERR, ERR, ERR, ERR } }, } },
+
+        { "local", {                // +local -cors -local-access
+            { "file",               {  OK,  OK, ERR, ERR } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK, ERR, ERR } },
+            { "local-cors",         {  OK,  OK, ERR, ERR } }, } },
+
+        { "local-cors", {           // +local +cors -local-access
+            { "file",               {  OK,  OK, ERR, ERR } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK, ERR, ERR } },
+            { "local-cors",         {  OK,  OK, ERR, ERR } }, } },
+
+        { "local-localaccess", {    // +local -cors +local-access
+            { "file",               {  OK,  OK,  OK,  OK } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK,  OK,  OK } },
+            { "local-cors",         {  OK,  OK,  OK,  OK } }, } },
+
+        { "localaccess", {          // -local -cors +local-access
+            { "file",               {  OK,  OK,  OK,  OK } },
+            { "qrc",                { ERR, ERR, ERR, ERR } },
+            { "tst",                { ERR, ERR, ERR, ERR } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  {  OK,  OK,  OK,  OK } },
+            { "local-cors",         {  OK,  OK,  OK,  OK } }, } },
     };
 
     for (auto &&d : data) {
         auto schemeFrom = d.first;
 
         for (int i = 0; i < 4; ++i) {
-            auto it = settingCombinations.begin() + i;
-            bool canAccessFileUrls = it->first, canAccessRemoteUrl = it->second;
+            const auto &it = settingCombinations[i];
+            bool canAccessFileUrls = it.first, canAccessRemoteUrl = it.second;
 
             QVariantMap testPairs;
             for (auto &&destSchemes : d.second) {
                 auto &&destScheme = destSchemes.first;
                 auto &&expectedResults = destSchemes.second;
-                auto rit = expectedResults.begin() + i;
-                testPairs[destScheme] = *rit;
+                testPairs[destScheme] = expectedResults[i];
             }
 
             QTest::addRow("%s_%s_%s", schemeFrom, (canAccessFileUrls ? "local" : "nolocal"), (canAccessRemoteUrl ? "remote" : "noremote"))
@@ -780,6 +839,174 @@ void tst_Origins::mixedXHR()
             .arg(schemeFrom).arg(schemesTo.join(' ')).arg(results.join(' ')).arg(expected.join(' '))));
 }
 
+// Load the main page over one scheme, then load an iframe over a different scheme. This load is not considered CORS.
+void tst_Origins::mixedContent_data()
+{
+    QTest::addColumn<QString>("schemeFrom");
+    QTest::addColumn<bool>("canAccessFileUrls");
+    QTest::addColumn<bool>("canAccessRemoteUrl");
+    QTest::addColumn<QVariantMap>("testPairs");
+
+    bool defaultFileAccess = true;
+    bool defaultRemoteAccess = false;
+    std::vector<std::pair<bool, bool>> settingCombinations = {
+        { defaultFileAccess, defaultRemoteAccess },  // tag: *schemeFrom*_local_noremote
+        { defaultFileAccess, !defaultRemoteAccess }, // tag: *schemeFrom*_local_remote
+        { !defaultFileAccess, defaultRemoteAccess }, // tag: *schemeFrom*_nolocal_noremote
+        { !defaultFileAccess, !defaultRemoteAccess } // tag: *schemeFrom*_nolocal_remote
+    };
+
+    QVariant SLF = QVariant(QSL("canLoadAndAccess")), OK = QVariant(QSL("canLoadButNotAccess")), ERR = QVariant(QSL("cannotLoad"));
+    std::vector<
+        std::pair<const char *, std::vector<
+            std::pair<const char *, std::vector<QVariant>>>>> data = {
+        { "file", {
+            { "file",               { SLF, SLF, ERR, ERR } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                { ERR,  OK, ERR,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK, ERR, ERR } },
+            { "local-cors",         {  OK,  OK, ERR, ERR } },
+        } },
+
+        { "qrc",  {
+            { "file",               { ERR, ERR, ERR, ERR } },
+            { "qrc",                { SLF, SLF, SLF, SLF } },
+            { "tst",                {  OK,  OK,  OK,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  { ERR, ERR, ERR, ERR } },
+            { "local-cors",         { ERR, ERR, ERR, ERR } }, } },
+
+        { "tst",  {
+            { "file",               { ERR, ERR, ERR, ERR } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                { SLF, SLF, SLF, SLF } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  { ERR, ERR, ERR, ERR } },
+            { "local-cors",         { ERR, ERR, ERR, ERR } }, } },
+
+        { "cors", {                 // -local +cors -local-access
+            { "file",               { ERR, ERR, ERR, ERR } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                {  OK,  OK,  OK,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { SLF, SLF, SLF, SLF } },
+            { "local-localaccess",  { ERR, ERR, ERR, ERR } },
+            { "local-cors",         { ERR, ERR, ERR, ERR } }, } },
+
+        { "local", {                // +local -cors -local-access
+            { "file",               {  OK,  OK, ERR, ERR } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                { ERR,  OK, ERR,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK, ERR, ERR } },
+            { "local-cors",         {  OK,  OK, ERR, ERR } },
+        } },
+
+        { "local-cors", {           // +local +cors -local-access
+            { "file",               {  OK,  OK, ERR, ERR } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                { ERR,  OK, ERR,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  {  OK,  OK, ERR, ERR } },
+            { "local-cors",         { SLF, SLF, ERR, ERR } },
+        } },
+
+        { "local-localaccess", {    // +local -cors + OK-access
+            { "file",               {  OK,  OK,  OK,  OK } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                { ERR,  OK, ERR,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               { ERR,  OK, ERR,  OK } },
+            { "local-localaccess",  { SLF, SLF,  OK,  OK } }, // ### should probably be: SLF, SLF, SLF, SLF
+            { "local-cors",         {  OK,  OK,  OK,  OK } },
+        } },
+
+        { "localaccess", {          // -local -cors +local-access
+            { "file",               {  OK,  OK,  OK,  OK } },
+            { "qrc",                {  OK,  OK,  OK,  OK } },
+            { "tst",                {  OK,  OK,  OK,  OK } },
+            { "data",               {  OK,  OK,  OK,  OK } },
+            { "cors",               {  OK,  OK,  OK,  OK } },
+            { "local-localaccess",  {  OK,  OK,  OK,  OK } },
+            { "local-cors",         {  OK,  OK,  OK,  OK } }, } },
+    };
+
+    for (auto &&d : data) {
+        auto schemeFrom = d.first;
+
+        for (int i = 0; i < 4; ++i) {
+            const auto &it = settingCombinations[i];
+            bool canAccessFileUrls = it.first, canAccessRemoteUrl = it.second;
+
+            QVariantMap testPairs;
+            for (auto &&destSchemes : d.second) {
+                auto &&destScheme = destSchemes.first;
+                auto &&expectedResults = destSchemes.second;
+                testPairs[destScheme] = expectedResults[i];
+            }
+
+            QTest::addRow("%s_%s_%s", schemeFrom, (canAccessFileUrls ? "local" : "nolocal"), (canAccessRemoteUrl ? "remote" : "noremote"))
+                << schemeFrom << canAccessFileUrls << canAccessRemoteUrl << testPairs;
+        }
+    }
+}
+
+void tst_Origins::mixedContent()
+{
+    QFETCH(QString, schemeFrom);
+    QFETCH(bool, canAccessFileUrls);
+    QFETCH(bool, canAccessRemoteUrl);
+    QFETCH(QVariantMap, testPairs);
+
+    QString srcDir(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath());
+    auto loadUrl = QString("%1:%2/resources/mixedSchemes.html").arg(schemeFrom).arg(schemeFrom == "file" ? srcDir : "");
+
+    QCOMPARE(testPairs.size(), 7);
+    ScopedAttribute sa2(m_page->settings(), QWebEngineSettings::ErrorPageEnabled, false);
+    ScopedAttribute sa0(m_page->settings(), QWebEngineSettings::LocalContentCanAccessFileUrls, canAccessFileUrls);
+    ScopedAttribute sa1(m_page->settings(), QWebEngineSettings::LocalContentCanAccessRemoteUrls, canAccessRemoteUrl);
+    QVERIFY(verifyLoad(loadUrl));
+
+    auto setIFrameUrl = [&] (const QString &scheme) {
+        if (scheme == "data")
+            return QString("setIFrameUrl('data:,<script>var canary = true; parent.canary = true</script>')");
+        auto frameUrl = QString("%1:%2/resources/mixedSchemes_frame.html").arg(scheme).arg(scheme == "file" ? srcDir : "");
+        return QString("setIFrameUrl('%1')").arg(frameUrl);
+    };
+
+    m_page->messages.clear();
+    QStringList schemesTo, expected, results;
+    for (auto it = testPairs.begin(), end = testPairs.end(); it != end; ++it) {
+
+        auto schemeTo = it.key();
+        auto expectedResult = it.value().toString();
+
+        eval(setIFrameUrl(schemeTo));
+
+        QTRY_COMPARE(eval(QSL("result !== undefined")), QVariant(true));
+        auto result = eval(QSL("result")).toString();
+        // Work-around some combinations missing JS loaded signals:
+        if (m_page->messages.count() > 0) {
+            if (m_page->messages[0] == QSL("Frame Loaded") && result == QSL("cannotLoad"))
+                result = QSL("canLoadButNotAccess");
+            m_page->messages.clear();
+        }
+
+        schemesTo.append(schemeTo.rightJustified(20));
+        results.append(result.rightJustified(20));
+        expected.append(expectedResult.rightJustified(20));
+    }
+    QVERIFY2(results == expected,
+        qPrintable(QString("\nFrom '%1' to:\n\tScheme: %2\n\tActual: %3\n\tExpect: %4")
+            .arg(schemeFrom).arg(schemesTo.join(' ')).arg(results.join(' ')).arg(expected.join(' '))));
+}
+
 #if defined(WEBSOCKETS)
 class EchoServer : public QObject {
     Q_OBJECT
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index 10147ae6c..ce35ae1f0 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -110,6 +110,7 @@ void HttpServer::handleNewConnection()
                     if (f.open(QFile::ReadOnly)) {
                         QMimeType mime = QMimeDatabase().mimeTypeForFileNameAndData(f.fileName(), &f);
                         rr->setResponseHeader(QByteArrayLiteral("Content-Type"), mime.name().toUtf8());
+                        rr->setResponseHeader(QByteArrayLiteral("Access-Control-Allow-Origin"), QByteArrayLiteral("*"));
                         rr->setResponseBody(f.readAll());
                         rr->sendResponse();
                     } else {
-- 
cgit v1.2.3


From 89449238860b77b5a6d2339a269e0363314f3ae6 Mon Sep 17 00:00:00 2001
From: Balazs Egedi <egedib@inf.u-szeged.hu>
Date: Mon, 16 Aug 2021 14:40:27 +0200
Subject: Port touchbrowser to Qt6

- Touchbrowser is only using QuickControls2.
- Missing resource files are added.

Change-Id: Ic8402b1d2daed8906d1244bfab2854d0d8844276
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 5f9b031d9b6333486198061c073161f3ff5f2d94)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/manual/quick/touchbrowser/AddressBar.qml     |  24 +++---
 tests/manual/quick/touchbrowser/MockTouchPoint.qml |  53 ++++++++++++
 tests/manual/quick/touchbrowser/main.qml           |   6 +-
 tests/manual/quick/touchbrowser/qml.qrc            |   2 +
 .../quick/touchbrowser/touchmockingapplication.cpp |  91 ++++++++++-----------
 .../quick/touchbrowser/touchmockingapplication.h   |  18 ++--
 tests/manual/quick/touchbrowser/touchpoint.png     | Bin 0 -> 1331 bytes
 7 files changed, 120 insertions(+), 74 deletions(-)
 create mode 100644 tests/manual/quick/touchbrowser/MockTouchPoint.qml
 create mode 100644 tests/manual/quick/touchbrowser/touchpoint.png

(limited to 'tests')

diff --git a/tests/manual/quick/touchbrowser/AddressBar.qml b/tests/manual/quick/touchbrowser/AddressBar.qml
index 1daae6dbf..77d887f3f 100644
--- a/tests/manual/quick/touchbrowser/AddressBar.qml
+++ b/tests/manual/quick/touchbrowser/AddressBar.qml
@@ -26,9 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick
+import QtQuick.Controls
 
 Rectangle {
     id: root
@@ -59,6 +58,14 @@ Rectangle {
     TextField {
         id: addressField
         anchors.fill: parent
+        leftPadding: 30
+
+        background: Rectangle {
+            color: "transparent"
+            border.color: "black"
+            border.width: 1
+            radius: root.radius
+        }
 
         Image {
             anchors.verticalCenter: addressField.verticalCenter
@@ -78,17 +85,6 @@ Rectangle {
             visible: root.progress < 100
         }
 
-        style: TextFieldStyle {
-            padding.left: 30
-
-            background: Rectangle {
-                color: "transparent"
-                border.color: "black"
-                border.width: 1
-                radius: root.radius
-            }
-        }
-
         onActiveFocusChanged: {
             if (activeFocus)
                 selectAll();
diff --git a/tests/manual/quick/touchbrowser/MockTouchPoint.qml b/tests/manual/quick/touchbrowser/MockTouchPoint.qml
new file mode 100644
index 000000000..bc24b002e
--- /dev/null
+++ b/tests/manual/quick/touchbrowser/MockTouchPoint.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt WebBrowser application.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+
+Item {
+    id: mockTouchPoint
+
+    property bool pressed: false
+    property int pointId: 0
+
+    Image {
+        source: "qrc:/touchpoint.png"
+        x: -(width / 2)
+        y: -(height / 2)
+        opacity: mockTouchPoint.pressed ? 0.6 : 0.0
+
+        Behavior on opacity {
+            NumberAnimation { duration: 200 }
+        }
+
+        Text {
+            text: mockTouchPoint.pointId
+            anchors.centerIn: parent
+        }
+    }
+}
diff --git a/tests/manual/quick/touchbrowser/main.qml b/tests/manual/quick/touchbrowser/main.qml
index 926b3a941..1b864c057 100644
--- a/tests/manual/quick/touchbrowser/main.qml
+++ b/tests/manual/quick/touchbrowser/main.qml
@@ -26,9 +26,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
-import QtQuick.Layouts 1.3
-import QtWebEngine 1.3
+import QtQuick
+import QtQuick.Layouts
+import QtWebEngine
 
 Item {
     function load(url) {
diff --git a/tests/manual/quick/touchbrowser/qml.qrc b/tests/manual/quick/touchbrowser/qml.qrc
index 45210fe36..5c384502e 100644
--- a/tests/manual/quick/touchbrowser/qml.qrc
+++ b/tests/manual/quick/touchbrowser/qml.qrc
@@ -2,5 +2,7 @@
     <qresource prefix="/">
         <file>main.qml</file>
         <file>AddressBar.qml</file>
+        <file>MockTouchPoint.qml</file>
+        <file>touchpoint.png</file>
     </qresource>
 </RCC>
diff --git a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
index 41b731a6a..b856365bf 100644
--- a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
+++ b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
@@ -29,12 +29,9 @@
 #include "touchmockingapplication.h"
 
 #include <qpa/qwindowsysteminterface.h>
-#include <QtCore/QEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QTouchDevice>
-#include <QtGui/QTouchEvent>
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickView>
+#include <QInputDevice>
 
 static inline bool isTouchEvent(const QEvent* event)
 {
@@ -94,10 +91,10 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
     if (event->type() == QEvent::KeyRelease && static_cast<QKeyEvent*>(event)->key() == Qt::Key_Control) {
         foreach (int id, m_heldTouchPoints)
             if (m_touchPoints.contains(id) && !QGuiApplication::mouseButtons().testFlag(Qt::MouseButton(id))) {
-                m_touchPoints[id].setState(Qt::TouchPointReleased);
+                QMutableEventPoint::from(m_touchPoints[id]).setState(QEventPoint::Released);
                 m_heldTouchPoints.remove(id);
             } else
-                m_touchPoints[id].setState(Qt::TouchPointStationary);
+                QMutableEventPoint::from(m_touchPoints[id]).setState(QEventPoint::Stationary);
 
         sendTouchEvent(window, m_heldTouchPoints.isEmpty() ? QEvent::TouchEnd : QEvent::TouchUpdate, static_cast<QKeyEvent*>(event)->timestamp());
     }
@@ -105,19 +102,19 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
     if (isMouseEvent(event)) {
         const QMouseEvent* const mouseEvent = static_cast<QMouseEvent*>(event);
 
-        QTouchEvent::TouchPoint touchPoint;
-        touchPoint.setPressure(1);
+        QEventPoint touchPoint;
+        QMutableEventPoint::from(touchPoint).setPressure(1);
 
         QEvent::Type touchType = QEvent::None;
 
         switch (mouseEvent->type()) {
         case QEvent::MouseButtonPress:
-            touchPoint.setId(mouseEvent->button());
+            QMutableEventPoint::from(touchPoint).setId(mouseEvent->button());
             if (m_touchPoints.contains(touchPoint.id())) {
-                touchPoint.setState(Qt::TouchPointMoved);
+                QMutableEventPoint::from(touchPoint).setState(QEventPoint::Updated);
                 touchType = QEvent::TouchUpdate;
             } else {
-                touchPoint.setState(Qt::TouchPointPressed);
+                QMutableEventPoint::from(touchPoint).setState(QEventPoint::Pressed);
                 // Check if more buttons are held down than just the event triggering one.
                 if (mouseEvent->buttons() > mouseEvent->button())
                     touchType = QEvent::TouchUpdate;
@@ -135,8 +132,8 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
                 return true;
             }
             touchType = QEvent::TouchUpdate;
-            touchPoint.setId(mouseEvent->buttons());
-            touchPoint.setState(Qt::TouchPointMoved);
+            QMutableEventPoint::from(touchPoint).setId(mouseEvent->buttons());
+            QMutableEventPoint::from(touchPoint).setState(QEventPoint::Updated);
             break;
         case QEvent::MouseButtonRelease:
             // Check if any buttons are still held down after this event.
@@ -144,8 +141,8 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
                 touchType = QEvent::TouchUpdate;
             else
                 touchType = QEvent::TouchEnd;
-            touchPoint.setId(mouseEvent->button());
-            touchPoint.setState(Qt::TouchPointReleased);
+            QMutableEventPoint::from(touchPoint).setId(mouseEvent->button());
+            QMutableEventPoint::from(touchPoint).setState(QEventPoint::Released);
             break;
         case QEvent::MouseButtonDblClick:
             // Eat double-clicks, their accompanying press event is all we need.
@@ -163,7 +160,7 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
         if (touchPoint.id() & Qt::RightButton)
             updateTouchPoint(mouseEvent, touchPoint, Qt::RightButton);
 
-        if (m_holdingControl && touchPoint.state() == Qt::TouchPointReleased) {
+        if (m_holdingControl && touchPoint.state() == QEventPoint::Released) {
             // We avoid sending the release event because the Flickable is
             // listening to mouse events and would start a bounce-back
             // animation if it received a mouse release.
@@ -172,9 +169,9 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
         }
 
         // Update states for all other touch-points
-        for (QHash<int, QTouchEvent::TouchPoint>::iterator it = m_touchPoints.begin(), end = m_touchPoints.end(); it != end; ++it) {
+        for (QHash<int, QEventPoint>::iterator it = m_touchPoints.begin(), end = m_touchPoints.end(); it != end; ++it) {
             if (!(it.value().id() & touchPoint.id()))
-                it.value().setState(Qt::TouchPointStationary);
+                QMutableEventPoint::from(it.value()).setState(QEventPoint::Stationary);
         }
 
         Q_ASSERT(touchType != QEvent::None);
@@ -189,14 +186,14 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
     return QGuiApplication::notify(target, event);
 }
 
-void TouchMockingApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QTouchEvent::TouchPoint touchPoint, Qt::MouseButton mouseButton)
+void TouchMockingApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QEventPoint touchPoint, Qt::MouseButton mouseButton)
 {
     // Ignore inserting additional touch points if Ctrl isn't held because it produces
     // inconsistent touch events and results in assers in the gesture recognizers.
     if (!m_holdingControl && m_touchPoints.size() && !m_touchPoints.contains(mouseButton))
         return;
 
-    if (m_holdingControl && touchPoint.state() == Qt::TouchPointReleased) {
+    if (m_holdingControl && touchPoint.state() == QEventPoint::Released) {
         m_heldTouchPoints.insert(mouseButton);
         return;
     }
@@ -205,57 +202,59 @@ void TouchMockingApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QT
     // but since the canvas translates touch events we actually need to pass
     // the screen position as the scene position to deliver the appropriate
     // coordinates to the target.
-    touchPoint.setPos(mouseEvent->localPos());
-    touchPoint.setScenePos(mouseEvent->screenPos());
+    QMutableEventPoint::from(touchPoint).setPosition(mouseEvent->position());
+    QMutableEventPoint::from(touchPoint).setScenePosition(mouseEvent->globalPosition());
 
-    if (touchPoint.state() == Qt::TouchPointPressed)
-        touchPoint.setStartScenePos(mouseEvent->screenPos());
+    if (touchPoint.state() == QEventPoint::Pressed)
+        QMutableEventPoint::from(touchPoint).setScenePosition(mouseEvent->scenePosition());
     else {
-        const QTouchEvent::TouchPoint& oldTouchPoint = m_touchPoints[mouseButton];
-        touchPoint.setStartScenePos(oldTouchPoint.startScenePos());
-        touchPoint.setLastPos(oldTouchPoint.pos());
-        touchPoint.setLastScenePos(oldTouchPoint.scenePos());
+        const QEventPoint& oldTouchPoint = m_touchPoints[mouseButton];
+        QMutableEventPoint::from(touchPoint).setGlobalLastPosition(oldTouchPoint.globalPosition());
     }
 
     // Update current touch-point.
-    touchPoint.setId(mouseButton);
+    QMutableEventPoint::from(touchPoint).setId(mouseButton);
     m_touchPoints.insert(mouseButton, touchPoint);
 }
 
 bool TouchMockingApplication::sendTouchEvent(QQuickView* window, QEvent::Type type, ulong timestamp)
 {
-    static QTouchDevice* device = 0;
+    static QPointingDevice* device = 0;
     if (!device) {
-        device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
+        device = new QPointingDevice(QStringLiteral("MockTouchDevice"), 1,
+                                     QPointingDevice::DeviceType::TouchScreen,
+                                     QPointingDevice::PointerType::AllPointerTypes,
+                                     QInputDevice::Capability::All, 3, 3,
+                                     QString(), QPointingDeviceUniqueId(), window->rootObject());
+
+        QWindowSystemInterface::registerInputDevice(device);
     }
 
     m_pendingFakeTouchEventCount++;
 
-    const QList<QTouchEvent::TouchPoint>& currentTouchPoints = m_touchPoints.values();
-    Qt::TouchPointStates touchPointStates = Qt::TouchPointState();
-    foreach (const QTouchEvent::TouchPoint& touchPoint, currentTouchPoints)
+    const QList<QEventPoint>& currentTouchPoints = m_touchPoints.values();
+    QEventPoint::States touchPointStates = QEventPoint::States();
+    foreach (const QEventPoint& touchPoint, currentTouchPoints)
         touchPointStates |= touchPoint.state();
 
-    QTouchEvent event(type, device, Qt::NoModifier, touchPointStates, currentTouchPoints);
+    QTouchEvent event(type, device, Qt::NoModifier, currentTouchPoints);
     event.setTimestamp(timestamp);
     event.setAccepted(false);
 
     QGuiApplication::notify(window, &event);
 
-    updateVisualMockTouchPoints(window,m_holdingControl ? currentTouchPoints : QList<QTouchEvent::TouchPoint>());
+    updateVisualMockTouchPoints(window, m_holdingControl ? currentTouchPoints : QList<QEventPoint>());
 
     // Get rid of touch-points that are no longer valid
-    foreach (const QTouchEvent::TouchPoint& touchPoint, currentTouchPoints) {
-        if (touchPoint.state() ==  Qt::TouchPointReleased)
+    foreach (const QEventPoint& touchPoint, currentTouchPoints) {
+        if (touchPoint.state() == QEventPoint::Released)
             m_touchPoints.remove(touchPoint.id());
     }
 
     return event.isAccepted();
 }
 
-void TouchMockingApplication::updateVisualMockTouchPoints(QQuickView* window,const QList<QTouchEvent::TouchPoint>& touchPoints)
+void TouchMockingApplication::updateVisualMockTouchPoints(QQuickView* window,const QList<QEventPoint>& touchPoints)
 {
     if (touchPoints.isEmpty()) {
         // Hide all touch indicator items.
@@ -265,11 +264,11 @@ void TouchMockingApplication::updateVisualMockTouchPoints(QQuickView* window,con
         return;
     }
 
-    foreach (const QTouchEvent::TouchPoint& touchPoint, touchPoints) {
+    foreach (const QEventPoint& touchPoint, touchPoints) {
         QQuickItem* mockTouchPointItem = m_activeMockComponents.value(touchPoint.id());
 
         if (!mockTouchPointItem) {
-            QQmlComponent touchMockPointComponent(window->engine(), QUrl("qrc:///qml/MockTouchPoint.qml"));
+            QQmlComponent touchMockPointComponent(window->engine(), QUrl("qrc:///MockTouchPoint.qml"));
             mockTouchPointItem = qobject_cast<QQuickItem*>(touchMockPointComponent.create());
             Q_ASSERT(mockTouchPointItem);
             m_activeMockComponents.insert(touchPoint.id(), mockTouchPointItem);
@@ -278,10 +277,10 @@ void TouchMockingApplication::updateVisualMockTouchPoints(QQuickView* window,con
             mockTouchPointItem->setParentItem(window->rootObject());
         }
 
-        mockTouchPointItem->setX(touchPoint.pos().x());
-        mockTouchPointItem->setY(touchPoint.pos().y());
+        mockTouchPointItem->setX(touchPoint.position().x());
+        mockTouchPointItem->setY(touchPoint.position().y());
         mockTouchPointItem->setWidth(touchPoint.ellipseDiameters().width());
         mockTouchPointItem->setHeight(touchPoint.ellipseDiameters().height());
-        mockTouchPointItem->setProperty("pressed", QVariant(touchPoint.state() != Qt::TouchPointReleased));
+        mockTouchPointItem->setProperty("pressed", QVariant(touchPoint.state() != QEventPoint::Released));
     }
 }
diff --git a/tests/manual/quick/touchbrowser/touchmockingapplication.h b/tests/manual/quick/touchbrowser/touchmockingapplication.h
index cdabe871f..205cab694 100644
--- a/tests/manual/quick/touchbrowser/touchmockingapplication.h
+++ b/tests/manual/quick/touchbrowser/touchmockingapplication.h
@@ -29,11 +29,11 @@
 #ifndef TOUCHMOCKINGAPPLICATION_H
 #define TOUCHMOCKINGAPPLICATION_H
 
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QUrl>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QTouchEvent>
+#include <QtGui/private/qeventpoint_p.h>
+#include <QtGui/QEventPoint>
+
+#include <private/qevent_p.h>
 
 QT_BEGIN_NAMESPACE
 class QQuickView;
@@ -50,19 +50,15 @@ public:
     virtual bool notify(QObject *, QEvent *) override;
 
 private:
-    void updateTouchPoint(const QMouseEvent *, QTouchEvent::TouchPoint, Qt::MouseButton);
+    void updateTouchPoint(const QMouseEvent *, QEventPoint, Qt::MouseButton);
     bool sendTouchEvent(QQuickView *, QEvent::Type, ulong timestamp);
-    void updateVisualMockTouchPoints(QQuickView *,const QList<QTouchEvent::TouchPoint> &touchPoints);
+    void updateVisualMockTouchPoints(QQuickView *,const QList<QEventPoint> &touchPoints);
 
 private:
     bool m_realTouchEventReceived;
     int m_pendingFakeTouchEventCount;
 
-    QPointF m_lastPos;
-    QPointF m_lastScreenPos;
-    QPointF m_startScreenPos;
-
-    QHash<int, QTouchEvent::TouchPoint> m_touchPoints;
+    QHash<int, QEventPoint> m_touchPoints;
     QSet<int> m_heldTouchPoints;
     QHash<int, QQuickItem*> m_activeMockComponents;
 
diff --git a/tests/manual/quick/touchbrowser/touchpoint.png b/tests/manual/quick/touchbrowser/touchpoint.png
new file mode 100644
index 000000000..7649ee991
Binary files /dev/null and b/tests/manual/quick/touchbrowser/touchpoint.png differ
-- 
cgit v1.2.3


From 3c356d8f275d31bbba17fc6c1ebf0d7330dc11ef Mon Sep 17 00:00:00 2001
From: Balazs Egedi <egedib@inf.u-szeged.hu>
Date: Thu, 3 Feb 2022 15:53:25 +0100
Subject: Touchbrowser: port QMutableEventPoint::from() to static setters

Change-Id: I469d36018ac8f1458e57b1215f9c728c9628de67
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 0f2103ef375c6fbae65b53877055951a03000a4a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../quick/touchbrowser/touchmockingapplication.cpp | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'tests')

diff --git a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
index b856365bf..7a05567cb 100644
--- a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
+++ b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
@@ -91,10 +91,10 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
     if (event->type() == QEvent::KeyRelease && static_cast<QKeyEvent*>(event)->key() == Qt::Key_Control) {
         foreach (int id, m_heldTouchPoints)
             if (m_touchPoints.contains(id) && !QGuiApplication::mouseButtons().testFlag(Qt::MouseButton(id))) {
-                QMutableEventPoint::from(m_touchPoints[id]).setState(QEventPoint::Released);
+                QMutableEventPoint::setState(m_touchPoints[id], QEventPoint::Released);
                 m_heldTouchPoints.remove(id);
             } else
-                QMutableEventPoint::from(m_touchPoints[id]).setState(QEventPoint::Stationary);
+                QMutableEventPoint::setState(m_touchPoints[id], QEventPoint::Stationary);
 
         sendTouchEvent(window, m_heldTouchPoints.isEmpty() ? QEvent::TouchEnd : QEvent::TouchUpdate, static_cast<QKeyEvent*>(event)->timestamp());
     }
@@ -103,18 +103,18 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
         const QMouseEvent* const mouseEvent = static_cast<QMouseEvent*>(event);
 
         QEventPoint touchPoint;
-        QMutableEventPoint::from(touchPoint).setPressure(1);
+        QMutableEventPoint::setPressure(touchPoint, 1);
 
         QEvent::Type touchType = QEvent::None;
 
         switch (mouseEvent->type()) {
         case QEvent::MouseButtonPress:
-            QMutableEventPoint::from(touchPoint).setId(mouseEvent->button());
+            QMutableEventPoint::setId(touchPoint, mouseEvent->button());
             if (m_touchPoints.contains(touchPoint.id())) {
-                QMutableEventPoint::from(touchPoint).setState(QEventPoint::Updated);
+                QMutableEventPoint::setState(touchPoint, QEventPoint::Updated);
                 touchType = QEvent::TouchUpdate;
             } else {
-                QMutableEventPoint::from(touchPoint).setState(QEventPoint::Pressed);
+                QMutableEventPoint::setState(touchPoint, QEventPoint::Pressed);
                 // Check if more buttons are held down than just the event triggering one.
                 if (mouseEvent->buttons() > mouseEvent->button())
                     touchType = QEvent::TouchUpdate;
@@ -132,8 +132,8 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
                 return true;
             }
             touchType = QEvent::TouchUpdate;
-            QMutableEventPoint::from(touchPoint).setId(mouseEvent->buttons());
-            QMutableEventPoint::from(touchPoint).setState(QEventPoint::Updated);
+            QMutableEventPoint::setId(touchPoint, mouseEvent->buttons());
+            QMutableEventPoint::setState(touchPoint, QEventPoint::Updated);
             break;
         case QEvent::MouseButtonRelease:
             // Check if any buttons are still held down after this event.
@@ -141,8 +141,8 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
                 touchType = QEvent::TouchUpdate;
             else
                 touchType = QEvent::TouchEnd;
-            QMutableEventPoint::from(touchPoint).setId(mouseEvent->button());
-            QMutableEventPoint::from(touchPoint).setState(QEventPoint::Released);
+            QMutableEventPoint::setId(touchPoint, mouseEvent->button());
+            QMutableEventPoint::setState(touchPoint, QEventPoint::Released);
             break;
         case QEvent::MouseButtonDblClick:
             // Eat double-clicks, their accompanying press event is all we need.
@@ -171,7 +171,7 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
         // Update states for all other touch-points
         for (QHash<int, QEventPoint>::iterator it = m_touchPoints.begin(), end = m_touchPoints.end(); it != end; ++it) {
             if (!(it.value().id() & touchPoint.id()))
-                QMutableEventPoint::from(it.value()).setState(QEventPoint::Stationary);
+                QMutableEventPoint::setState(it.value(), QEventPoint::Stationary);
         }
 
         Q_ASSERT(touchType != QEvent::None);
@@ -202,18 +202,18 @@ void TouchMockingApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QE
     // but since the canvas translates touch events we actually need to pass
     // the screen position as the scene position to deliver the appropriate
     // coordinates to the target.
-    QMutableEventPoint::from(touchPoint).setPosition(mouseEvent->position());
-    QMutableEventPoint::from(touchPoint).setScenePosition(mouseEvent->globalPosition());
+    QMutableEventPoint::setPosition(touchPoint, mouseEvent->position());
+    QMutableEventPoint::setScenePosition(touchPoint, mouseEvent->globalPosition());
 
     if (touchPoint.state() == QEventPoint::Pressed)
-        QMutableEventPoint::from(touchPoint).setScenePosition(mouseEvent->scenePosition());
+        QMutableEventPoint::setScenePosition(touchPoint, mouseEvent->scenePosition());
     else {
         const QEventPoint& oldTouchPoint = m_touchPoints[mouseButton];
-        QMutableEventPoint::from(touchPoint).setGlobalLastPosition(oldTouchPoint.globalPosition());
+        QMutableEventPoint::setGlobalLastPosition(touchPoint, oldTouchPoint.globalPosition());
     }
 
     // Update current touch-point.
-    QMutableEventPoint::from(touchPoint).setId(mouseButton);
+    QMutableEventPoint::setId(touchPoint, mouseButton);
     m_touchPoints.insert(mouseButton, touchPoint);
 }
 
-- 
cgit v1.2.3


From 0575ffc991b7341c2867a03668b963d81800b812 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Thu, 16 Sep 2021 22:08:22 +0200
Subject: Fix crash on WebEngine(View|Profile).userScripts.collection get

To create a javascript list on 'collection' method qml engine is needed
for a qml scope, but it's only available for objects, which are created
by the QML Engine itself. The only object in hierarchy of classes is an
actual WebEngineView, so get it from there on collection init.
Also implement delayed initialization of scripts collection for the
usage of default profile through WebEngine singleton, and for the reason
that it's not really needed until really asked by user code.

Fixes: QTBUG-96597
Change-Id: I61e76652a5d0fd5609070fd541816503908f2dc8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit f5fbc34fc16fc9c6e7f7e8bbbf60f5b343b9466d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/data/tst_userScripts.qml | 42 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index 0f1042f80..f885368ec 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -60,6 +60,8 @@ Item {
         return script
     }
 
+    WebEngineProfile { id: testProfile }
+
     TestWebEngineView {
         id: webEngineView
         width: 400
@@ -89,13 +91,28 @@ Item {
     }
 
     TestCase {
-        name: "WebEngineViewUserScripts"
-
+        name: "UserScripts"
 
-        function init() {
+        function cleanup() {
             webEngineView.url = "";
             webEngineView.userScripts.collection = [];
+            compare(webEngineView.userScripts.collection.length, 0)
             webEngineView.profile.userScripts.collection = [];
+            compare(webEngineView.profile.userScripts.collection.length, 0)
+        }
+
+        function test_profileScripts() {
+            // assusme it is the same type as in View
+            let t1 = String(testProfile.userScripts), t2 = String(webEngineView.userScripts)
+            compare(t1.substr(0, t1.indexOf('(')), t2.substr(0, t2.indexOf('(')))
+
+            // ... and just test basic things like access
+            compare(testProfile.userScripts.collection, [])
+            let script = changeDocumentTitleScript()
+            testProfile.userScripts.collection = [ script ]
+
+            compare(testProfile.userScripts.collection.length, 1)
+            compare(testProfile.userScripts.collection[0].name, script.name)
         }
 
         function test_oneScript() {
@@ -103,8 +120,10 @@ Item {
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "Test page 1");
 
-            webEngineView.userScripts.collection = [ changeDocumentTitleScript() ]
-            
+            let script = changeDocumentTitleScript()
+            webEngineView.userScripts.collection = [ script ]
+            compare(webEngineView.userScripts.collection.length, 1)
+            compare(webEngineView.userScripts.collection[0].name, script.name)
             compare(webEngineView.title, "Test page 1");
 
             webEngineView.reload();
@@ -116,6 +135,7 @@ Item {
             tryCompare(webEngineView, "title", "New title");
 
             webEngineView.userScripts.collection = [];
+            compare(webEngineView.userScripts.collection.length, 0)
             compare(webEngineView.title, "New title");
 
             webEngineView.reload();
@@ -131,6 +151,7 @@ Item {
             var script2 = appendDocumentTitleScript();
             script2.injectionPoint = WebEngineScript.Deferred;
             webEngineView.userScripts.collection = [ script1, script2 ];
+            compare(webEngineView.userScripts.collection.length, 2)
 
             // Make sure the scripts are loaded in order.
             webEngineView.reload();
@@ -140,12 +161,14 @@ Item {
             script2.injectionPoint = WebEngineScript.DocumentReady
             script1.injectionPoint = WebEngineScript.Deferred
             webEngineView.userScripts.collection = [ script1, script2 ];
+            compare(webEngineView.userScripts.collection.length, 2)
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "New title");
 
             // Make sure we can remove scripts from the preload list.
             webEngineView.userScripts.collection = [ script2 ];
+            compare(webEngineView.userScripts.collection.length, 1)
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "Test page 1 with appendix");
@@ -169,6 +192,7 @@ Item {
 
         function test_bigScript() {
             webEngineView.userScripts.collection = [ bigUserScript() ];
+            compare(webEngineView.userScripts.collection.length, 1)
             webEngineView.url = Qt.resolvedUrl("test1.html");
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView , "title", "Big user script changed title");
@@ -180,6 +204,8 @@ Item {
             compare(script.injectionPoint, WebEngineScript.DocumentReady);
 
             webEngineView.userScripts.collection = [ script ];
+            compare(webEngineView.userScripts.collection.length, 1)
+            compare(webEngineView.userScripts.collection[0].name, script.name)
 
             // @include *data/test*.html
             webEngineView.url = Qt.resolvedUrl("test1.html");
@@ -208,6 +234,7 @@ Item {
             compare(script.injectionPoint, WebEngineScript.DocumentReady);
 
             webEngineView.userScripts.collection = [ script ];
+            compare(webEngineView.userScripts.collection.length, 1)
 
             // @match some:junk
             webEngineView.url = Qt.resolvedUrl("test2.html");
@@ -216,7 +243,10 @@ Item {
         }
 
         function test_profileWideScript() {
-            webEngineView.profile.userScripts.collection = [ changeDocumentTitleScript() ];
+            let script = changeDocumentTitleScript()
+            webEngineView.profile.userScripts.collection = [ script ];
+            compare(webEngineView.profile.userScripts.collection.length, 1)
+            compare(webEngineView.profile.userScripts.collection[0].name, script.name)
 
             webEngineView.url = Qt.resolvedUrl("test1.html");
             webEngineView.waitForLoadSucceeded();
-- 
cgit v1.2.3


From b38d42b6c6da2fb76746b7b2dbdefc6f01d3db93 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 9 Feb 2022 13:38:08 +0100
Subject: Stop using deprecated QWARN

Just use qWarning instead

Change-Id: I0382ca0e84daa50d32572d6827d908ae391d00d4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit ac615101d1c4013a9c1a6ecfae7d2da765fe9bf9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/publicapi/tst_publicapi.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index af22add1f..0608e3a13 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -905,7 +905,7 @@ void tst_publicapi::publicAPI()
     // Make sure that nothing slips in the public API unintentionally.
     for (const QString &actual : qAsConst(actualAPI)) {
         if (!expectedAPI.contains(actual)) {
-            QWARN(qPrintable("Expected list is not up-to-date: " + actual));
+            qWarning("Expected list is not up-to-date: %ls", qUtf16Printable(actual));
             apiMatch = false;
         }
     }
@@ -913,7 +913,7 @@ void tst_publicapi::publicAPI()
     for (const QString &expected : expectedAPI) {
         if (!actualAPI.contains(expected)) {
             apiMatch = false;
-            QWARN(qPrintable("Not implemented: " + expected));
+            qWarning("Not implemented: %ls", qUtf16Printable(expected));
         }
     }
 
-- 
cgit v1.2.3


From 6d56b7e2cb9e6faabf6561e6b5c21a4a7638885e Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 9 Feb 2022 13:36:47 +0100
Subject: Fix icon link

Was looking in resources/resources.

Change-Id: Id393da93cecf0510cb284957ff87cdb33ac5855c
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit f7fb8af99ea97d02f1a9cd527e9251213eb81652)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebengineview/resources/dummy.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineview/resources/dummy.html b/tests/auto/widgets/qwebengineview/resources/dummy.html
index 9075f27c3..f5ba1963a 100644
--- a/tests/auto/widgets/qwebengineview/resources/dummy.html
+++ b/tests/auto/widgets/qwebengineview/resources/dummy.html
@@ -1,6 +1,6 @@
 <html><head>
 <title>Dummy simple page without real content</title>
-<link rel='icon' href='resources/image2.png'/>
+<link rel='icon' href='qrc:///resources/image2.png'/>
 </head><body>
 <a>This is test content</a>
 </body></html>
-- 
cgit v1.2.3


From 5a982183c85b159e5c40e20436b93f462f144fa6 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Thu, 20 Jan 2022 18:36:02 +0100
Subject: Add testing of default constructed profile back

Amends d0ff107c00. Re-add test of default user created profile without
storage name. Also remove duplicated test for profile with storage name.

Change-Id: I5d404e06a8ea9a349d5122c7bf138cde768e8391
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 6de032c11537c9d89a52cece5912ac46f3a40f0d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qwebengineprofile/tst_qwebengineprofile.cpp    | 41 +++++++++-------------
 1 file changed, 17 insertions(+), 24 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 38f3b04e7..c09f3b51a 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -57,9 +57,9 @@ class tst_QWebEngineProfile : public QObject
 
 private Q_SLOTS:
     void initTestCase();
-    void userDefaultProfile();
+    void defaultProfile_data();
     void defaultProfile();
-    void testProfile();
+    void userDefinedProfile();
     void clearDataFromCache();
     void disableCache();
     void urlSchemeHandlers();
@@ -103,32 +103,28 @@ void tst_QWebEngineProfile::initTestCase()
     QWebEngineUrlScheme::registerScheme(myscheme);
 }
 
-void tst_QWebEngineProfile::userDefaultProfile()
+static QString StandardCacheLocation() { static auto p = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); return p; }
+static QString StandardAppDataLocation() { static auto p = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); return p; }
+
+void tst_QWebEngineProfile::defaultProfile_data()
 {
-    QWebEngineProfile profile("Default");
-    QVERIFY(!profile.isOffTheRecord());
-    QCOMPARE(profile.storageName(), QStringLiteral("Default"));
-    QCOMPARE(profile.httpCacheType(), QWebEngineProfile::DiskHttpCache);
-    QCOMPARE(profile.persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
-    QCOMPARE(profile.cachePath(),
-             QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-                     + QStringLiteral("/QtWebEngine/Default"));
-    QCOMPARE(profile.persistentStoragePath(),
-             QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
-                     + QStringLiteral("/QtWebEngine/Default"));
+    QTest::addColumn<bool>("userCreated");
+    QTest::addRow("global") << false;
+    QTest::addRow("user") << true;
 }
 
 void tst_QWebEngineProfile::defaultProfile()
 {
-    QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
+    QFETCH(bool, userCreated);
+    QScopedPointer<QWebEngineProfile> p(userCreated ? new QWebEngineProfile : nullptr);
+    QWebEngineProfile *profile = userCreated ? p.get() : QWebEngineProfile::defaultProfile();
     QVERIFY(profile);
     QVERIFY(profile->isOffTheRecord());
+    QCOMPARE(profile->storageName(), QString());
     QCOMPARE(profile->httpCacheType(), QWebEngineProfile::MemoryHttpCache);
     QCOMPARE(profile->persistentCookiesPolicy(), QWebEngineProfile::NoPersistentCookies);
     QCOMPARE(profile->cachePath(), QString());
-    QCOMPARE(profile->persistentStoragePath(),
-             QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
-                     + QStringLiteral("/QtWebEngine/OffTheRecord"));
+    QCOMPARE(profile->persistentStoragePath(), StandardAppDataLocation() + QStringLiteral("/QtWebEngine/OffTheRecord"));
     // TBD: setters do not really work
     profile->setCachePath(QStringLiteral("/home/foo/bar"));
     QCOMPARE(profile->cachePath(), QString());
@@ -140,18 +136,15 @@ void tst_QWebEngineProfile::defaultProfile()
     QCOMPARE(profile->persistentCookiesPolicy(), QWebEngineProfile::NoPersistentCookies);
 }
 
-
-void tst_QWebEngineProfile::testProfile()
+void tst_QWebEngineProfile::userDefinedProfile()
 {
     QWebEngineProfile profile(QStringLiteral("Test"));
     QVERIFY(!profile.isOffTheRecord());
     QCOMPARE(profile.storageName(), QStringLiteral("Test"));
     QCOMPARE(profile.httpCacheType(), QWebEngineProfile::DiskHttpCache);
     QCOMPARE(profile.persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
-    QCOMPARE(profile.cachePath(),  QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-             + QStringLiteral("/QtWebEngine/Test"));
-    QCOMPARE(profile.persistentStoragePath(),  QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
-             + QStringLiteral("/QtWebEngine/Test"));
+    QCOMPARE(profile.cachePath(), StandardCacheLocation() + QStringLiteral("/QtWebEngine/Test"));
+    QCOMPARE(profile.persistentStoragePath(), StandardAppDataLocation() + QStringLiteral("/QtWebEngine/Test"));
 }
 
 class AutoDir : public QDir
-- 
cgit v1.2.3


From ec6d24f7792fceee843ece735729f5b23dda5808 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Thu, 20 Jan 2022 19:14:02 +0100
Subject: Add QML test for basic profiles and fix the docs accordingly

Amends d0ff107c00. Ensure default values for profile settings match the
docs. Also fix doc's issues after off-the-record toggle to off by default.

Change-Id: I558a77dbec82d7f2b335b1a2ceca74ab66a1a6e9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit f34292d147bfde094d8ec4a58f7b0e5f77a1fd0b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/CMakeLists.txt           |   1 +
 .../auto/quick/qmltests/data/tst_basicProfiles.qml | 115 +++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 tests/auto/quick/qmltests/data/tst_basicProfiles.qml

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt
index 455c4c746..2500ed6df 100644
--- a/tests/auto/quick/qmltests/CMakeLists.txt
+++ b/tests/auto/quick/qmltests/CMakeLists.txt
@@ -18,6 +18,7 @@ set(testList
     tst_activeFocusOnPress.qml
     tst_audioMuted.qml
     tst_contextMenu.qml
+    tst_basicProfiles.qml
     tst_desktopBehaviorLoadHtml.qml
     tst_download.qml
     tst_favicon.qml
diff --git a/tests/auto/quick/qmltests/data/tst_basicProfiles.qml b/tests/auto/quick/qmltests/data/tst_basicProfiles.qml
new file mode 100644
index 000000000..a84e4e997
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_basicProfiles.qml
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+import QtTest
+import QtWebEngine
+import Qt.labs.platform
+
+Item {
+    WebEngineProfile { id: otrProfile; /* MEMO implicit offTheRecord: true */ }
+    WebEngineProfile { id: nonOtrProfile; offTheRecord: false }
+
+    function getPath(path, offset = 1) { return path.substr(path.indexOf(':') + offset, path.length) }
+    property string appDataLocation: getPath(getPath(StandardPaths.writableLocation(StandardPaths.AppDataLocation).toString(), 3))
+    property string cacheLocation: getPath(getPath(StandardPaths.writableLocation(StandardPaths.CacheLocation).toString(), 3))
+    property string downloadLocation: getPath(getPath(StandardPaths.writableLocation(StandardPaths.DownloadLocation).toString(), 3))
+
+    TestCase {
+        name: "BasicProfiles"
+
+        function test_defaultProfile() {
+            let p = WebEngine.defaultProfile
+            verify(p.offTheRecord)
+
+            compare(p.storageName, '')
+            compare(p.cachePath, '')
+            compare(getPath(p.persistentStoragePath), appDataLocation + '/QtWebEngine/OffTheRecord')
+            compare(p.httpCacheType, WebEngineProfile.MemoryHttpCache)
+            compare(p.httpCacheMaximumSize, 0)
+            compare(p.persistentCookiesPolicy, WebEngineProfile.NoPersistentCookies)
+
+            compare(getPath(p.downloadPath), downloadLocation)
+            compare(p.httpAcceptLanguage, '')
+            verify(p.httpUserAgent !== '')
+            compare(p.spellCheckEnabled, false)
+            compare(p.spellCheckLanguages, [])
+
+            compare(p.userScripts.collection, [])
+        }
+
+        function test_otrProfile() {
+            let p = otrProfile
+            verify(p.offTheRecord)
+
+            compare(p.storageName, '')
+            compare(p.cachePath, '')
+            compare(getPath(p.persistentStoragePath), appDataLocation + '/QtWebEngine/OffTheRecord')
+            compare(p.httpCacheType, WebEngineProfile.MemoryHttpCache)
+            compare(p.httpCacheMaximumSize, 0)
+            compare(p.persistentCookiesPolicy, WebEngineProfile.NoPersistentCookies)
+
+            compare(getPath(p.downloadPath), downloadLocation)
+            compare(p.httpAcceptLanguage, '')
+            verify(p.httpUserAgent !== '')
+            compare(p.spellCheckEnabled, false)
+            compare(p.spellCheckLanguages, [])
+
+            compare(p.userScripts.collection, [])
+        }
+
+        function test_nonOtrProfile() {
+            let p = nonOtrProfile
+            verify(!p.offTheRecord)
+
+            compare(p.storageName, '')
+            compare(p.cachePath, '')
+            compare(getPath(p.persistentStoragePath), appDataLocation + '/QtWebEngine/UnknownProfile')
+            compare(p.httpCacheType, WebEngineProfile.MemoryHttpCache)
+            compare(p.httpCacheMaximumSize, 0)
+            compare(p.persistentCookiesPolicy, WebEngineProfile.NoPersistentCookies)
+
+            compare(getPath(p.downloadPath), downloadLocation)
+            compare(p.httpAcceptLanguage, '')
+            verify(p.httpUserAgent !== '')
+            compare(p.spellCheckEnabled, false)
+            compare(p.spellCheckLanguages, [])
+
+            compare(p.userScripts.collection, [])
+
+            p.storageName = 'Test'
+            compare(p.storageName, 'Test')
+            compare(getPath(p.cachePath), cacheLocation + '/QtWebEngine/' + p.storageName)
+            compare(getPath(p.persistentStoragePath), appDataLocation + '/QtWebEngine/' + p.storageName)
+
+            compare(p.httpCacheType, WebEngineProfile.DiskHttpCache)
+            compare(p.httpCacheMaximumSize, 0)
+            compare(p.persistentCookiesPolicy, WebEngineProfile.AllowPersistentCookies)
+        }
+    }
+}
-- 
cgit v1.2.3


From 58149efc65283abc8e762a17762eac372476175f Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 24 Feb 2022 09:56:01 +0100
Subject: Blacklist CertificateError::test_error

This test started to fail in ci, however
c++ counterpart works fine.

Task-number: QTBUG-101215
Change-Id: Ic94409b6db06f285d11ab10295d5ebaa831c0fa5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 123394142c887e049131b823933de88f258152b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/BLACKLIST | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index f4009e16c..2f8fa5e66 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -6,3 +6,6 @@ macos
 
 [CertificateError::test_fatalError]
 *
+
+[CertificateError::test_error]
+*
-- 
cgit v1.2.3


From d40496b96aa78b237b8de9bb1af81e6b5093838b Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 10 Feb 2022 10:56:34 +0100
Subject: Add qml user script collection unit test

Adds overlooked unit test to test collection API.

Note this test throws bunch of warnings
"Can't open user script ..." and it would require dummy js
files just to suppress those.

Change-Id: Iddf8150c5fee7a29b3dba75066fa51070053d69b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit af190c9d05d2a5afc2de4dd9b2172fec8e4ce3b7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/CMakeLists.txt           |   1 +
 .../qmltests/data/tst_userScriptCollection.qml     | 152 +++++++++++++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 tests/auto/quick/qmltests/data/tst_userScriptCollection.qml

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt
index 2500ed6df..d878bdfcf 100644
--- a/tests/auto/quick/qmltests/CMakeLists.txt
+++ b/tests/auto/quick/qmltests/CMakeLists.txt
@@ -52,6 +52,7 @@ set(testList
     tst_titleChanged.qml
     tst_unhandledKeyEventPropagation.qml
     tst_userScripts.qml
+    tst_userScriptCollection.qml
     tst_viewSource.qml
 )
 
diff --git a/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml b/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml
new file mode 100644
index 000000000..491590ffa
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+import QtTest
+import QtWebEngine
+
+Item {
+
+    WebEngineProfile { id: testProfile }
+
+    TestWebEngineView {
+        id: webEngineView
+        width: 400
+        height: 300
+    }
+
+    TestCase {
+        name: "UserScriptCollection"
+
+        function cleanup() {
+            webEngineView.url = ""
+            webEngineView.userScripts.collection = []
+            compare(webEngineView.userScripts.collection.length, 0)
+        }
+
+        function test_collection() {
+            let scriptFoo = { name: "Foo",
+                sourceUrl: Qt.resolvedUrl("foo.js"),
+                injectionPoint: WebEngineScript.DocumentReady
+            }
+            let scriptBar = WebEngine.script()
+
+            scriptBar.name = "Bar"
+            scriptBar.sourceUrl = Qt.resolvedUrl("bar.js")
+            scriptBar.injectionPoint = WebEngineScript.DocumentReady
+
+            compare(webEngineView.userScripts.collection.length, 0)
+            webEngineView.userScripts.collection = [ scriptFoo, scriptBar ]
+            compare(webEngineView.userScripts.collection.length, 2)
+            compare(webEngineView.userScripts.collection[0].name, scriptFoo.name)
+            compare(webEngineView.userScripts.collection[0].sourceUrl, scriptFoo.sourceUrl)
+            compare(webEngineView.userScripts.collection[1].name, scriptBar.name)
+            compare(webEngineView.userScripts.collection[1].sourceUrl, scriptBar.sourceUrl)
+            webEngineView.userScripts.collection = []
+            compare(webEngineView.userScripts.collection.length, 0)
+        }
+
+        function test_insert() {
+            let scriptFoo = WebEngine.script()
+            scriptFoo.name = "Foo"
+            scriptFoo.sourceUrl = Qt.resolvedUrl("foo.js")
+            scriptFoo.injectionPoint = WebEngineScript.DocumentReady
+            let scriptBar = WebEngine.script()
+            scriptBar.name = "Bar"
+            scriptBar.sourceUrl = Qt.resolvedUrl("bar.js")
+            scriptBar.injectionPoint = WebEngineScript.DocumentReady
+
+            compare(webEngineView.userScripts.collection.length, 0)
+            webEngineView.userScripts.insert(scriptFoo)
+            webEngineView.userScripts.insert(scriptBar)
+            compare(webEngineView.userScripts.collection.length, 2)
+            compare(webEngineView.userScripts.collection[0].name, scriptFoo.name)
+            compare(webEngineView.userScripts.collection[1].name, scriptBar.name)
+            webEngineView.userScripts.collection = []
+            compare(webEngineView.userScripts.collection.length, 0)
+
+            var list = [ scriptFoo , scriptBar]
+            webEngineView.userScripts.insert(list)
+            compare(webEngineView.userScripts.collection.length, 2)
+            compare(webEngineView.userScripts.collection[0].name, scriptFoo.name)
+            compare(webEngineView.userScripts.collection[1].name, scriptBar.name)
+        }
+
+        function test_find() {
+            let scriptA = WebEngine.script()
+            scriptA.name = "A"
+            scriptA.sourceUrl = Qt.resolvedUrl("A.js")
+            let scriptB = WebEngine.script()
+            scriptB.name = "A"
+            scriptB.sourceUrl = Qt.resolvedUrl("B.js")
+            let scriptC = WebEngine.script()
+            scriptC.name = "C"
+            scriptC.sourceUrl = Qt.resolvedUrl("C.js")
+
+            compare(webEngineView.userScripts.collection.length, 0)
+            webEngineView.userScripts.collection = [ scriptA, scriptB, scriptC ];
+            compare(webEngineView.userScripts.collection.length, 3)
+            let scriptsA = webEngineView.userScripts.find("A")
+            let scriptsB = webEngineView.userScripts.find("B")
+            let scriptsC = webEngineView.userScripts.find("C")
+            compare(scriptsA.length, 2)
+            compare(scriptsB.length, 0)
+            compare(scriptsC.length, 1)
+            compare(scriptsA[0].name, scriptA.name)
+            compare(scriptsA[0].sourceUrl, scriptA.sourceUrl)
+            compare(scriptsA[1].name, scriptB.name)
+            compare(scriptsA[1].sourceUrl, scriptB.sourceUrl)
+            compare(scriptsC[0].name, scriptC.name)
+            compare(scriptsC[0].sourceUrl, scriptC.sourceUrl)
+       }
+
+       function test_contains() {
+            let scriptFoo = WebEngine.script()
+            scriptFoo.name = "Foo"
+            let scriptBar = WebEngine.script()
+            scriptBar.name = "Bar"
+            compare(webEngineView.userScripts.collection.length, 0)
+            webEngineView.userScripts.collection = [ scriptFoo ]
+            compare(webEngineView.userScripts.collection.length, 1)
+            verify(webEngineView.userScripts.contains(scriptFoo))
+            verify(!webEngineView.userScripts.contains(scriptBar))
+       }
+
+       function test_clear() {
+            let scriptFoo = WebEngine.script()
+            scriptFoo.name = "Foo"
+            let scriptBar = WebEngine.script()
+            scriptBar.name = "Bar"
+            compare(webEngineView.userScripts.collection.length, 0)
+            webEngineView.userScripts.collection = [ scriptFoo ];
+            compare(webEngineView.userScripts.collection.length, 1)
+            webEngineView.userScripts.clear()
+            compare(webEngineView.userScripts.collection.length, 0)
+       }
+    }
+}
-- 
cgit v1.2.3


From 1baf16274b7d12dc575f4d5f157ff0e72abac107 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 31 Jan 2022 12:01:22 +0100
Subject: Add test for blocking of remote content
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-50686
Change-Id: Ie176bece1a44a6df608646e91171d02ceeea7e8f
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit b8603c148c6cd53bdd82d0b712971cfc1b747780)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/core/origins/resources/media.html | 15 +++++++++++++
 tests/auto/core/origins/tst_origins.cpp      | 32 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 tests/auto/core/origins/resources/media.html

(limited to 'tests')

diff --git a/tests/auto/core/origins/resources/media.html b/tests/auto/core/origins/resources/media.html
new file mode 100644
index 000000000..091485b61
--- /dev/null
+++ b/tests/auto/core/origins/resources/media.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Media</title>
+        <script>
+            function addAudio(src) {
+                let aud = document.createElement('audio')
+                aud.src = src
+                document.getElementsByTagName("body")[0].appendChild(aud)
+             }
+        </script>
+    </head>
+    <body>
+    </body>
+</html>
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index ce670991a..b958290f3 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -266,6 +266,8 @@ private Q_SLOTS:
     void mixedXHR();
     void mixedContent_data();
     void mixedContent();
+    void localMediaBlock_data();
+    void localMediaBlock();
 #if defined(WEBSOCKETS)
     void webSocket();
 #endif
@@ -1239,5 +1241,35 @@ void tst_Origins::redirect()
     QCOMPARE(m_handler->requests()[6], QUrl(QStringLiteral("redirect2:/resources/Akronim-Regular.woff2")));
 }
 
+void tst_Origins::localMediaBlock_data()
+{
+    QTest::addColumn<bool>("enableAccess");
+    QTest::addRow("enabled") << true;
+    QTest::addRow("disabled") << false;
+}
+
+void tst_Origins::localMediaBlock()
+{
+    QFETCH(bool, enableAccess);
+
+    std::atomic<bool> accessed = false;
+    HttpServer server;
+    server.setResourceDirs({ QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + "/resources" });
+    connect(&server, &HttpServer::newRequest, [&](HttpReqRep *) { accessed.store(true); });
+    QVERIFY(server.start());
+
+    ScopedAttribute sa1(m_page->settings(), QWebEngineSettings::LocalContentCanAccessRemoteUrls, enableAccess);
+
+    QVERIFY(verifyLoad("file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
+                       + "/resources/media.html"));
+    eval("addAudio('" + server.url("/mixedXHR.txt").toString() + "')");
+
+    // Give it a chance to avoid a false positive on the default value of accessed.
+    if (!enableAccess)
+        QTest::qSleep(500);
+    QTRY_COMPARE(accessed.load(), enableAccess);
+
+}
+
 QTEST_MAIN(tst_Origins)
 #include "tst_origins.moc"
-- 
cgit v1.2.3


From ce68f52bbf7802cae1ef75b6b661e6262d610c8f Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 15 Sep 2021 10:06:39 +0200
Subject: Fix qrc sources for QWebEngineScript

Fixes: QTBUG-96525
Change-Id: I39d6247c0dd0e55e4fb91b176f34e676eeabbcdd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit ce2d6a94ce99f8d6f82fbcbf45603f8eb7a92957)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/quick/qmltests/data/tst_webchannel.qml   | 6 ++++++
 tests/auto/quick/qmltests/data/webchannel-test.html | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_webchannel.qml b/tests/auto/quick/qmltests/data/tst_webchannel.qml
index 70edc1bcd..82db70288 100644
--- a/tests/auto/quick/qmltests/data/tst_webchannel.qml
+++ b/tests/auto/quick/qmltests/data/tst_webchannel.qml
@@ -81,6 +81,12 @@ Item {
         }
 
         function test_basic() {
+            webView.userScripts.collection = [ {
+                name: "qtwebchanneljs",
+                sourceUrl: Qt.resolvedUrl("qrc:/qtwebchannel/qwebchannel.js"),
+                injectionPoint: WebEngineScript.DocumentCreation,
+                worldId: WebEngineScript.MainWorld
+            }]
             webView.url = testUrl;
             verify(webView.waitForLoadSucceeded());
 
diff --git a/tests/auto/quick/qmltests/data/webchannel-test.html b/tests/auto/quick/qmltests/data/webchannel-test.html
index 92966b24a..d8c3b1305 100644
--- a/tests/auto/quick/qmltests/data/webchannel-test.html
+++ b/tests/auto/quick/qmltests/data/webchannel-test.html
@@ -2,7 +2,6 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
         <script type="text/javascript">
             //BEGIN SETUP
             var channel = new QWebChannel(qt.webChannelTransport, function(channel) {
-- 
cgit v1.2.3


From e2b1ea5092fe9fd90cbe465081e78659ea63f5e0 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 21 Mar 2022 18:14:11 +0100
Subject: Fix qimage compare in tst_webenginepage

After 019d0dd4 in qtbase comparing two images
also checks a color space. Simply copy the color space
for the comparison.

Fixes: QTBUG-101935
Change-Id: I446ee21336e242443960dab7dd4d47681bd598d9
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit cddf9c264532105fc9d15d41cfd7585299ccab8f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index d95c246fc..9ddd1eedb 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -66,6 +66,7 @@
 #include <qwebengineurlschemehandler.h>
 #include <qwebengineview.h>
 #include <qimagewriter.h>
+#include <QColorSpace>
 
 static void removeRecursive(const QString& dirname)
 {
@@ -520,6 +521,7 @@ void tst_QWebEnginePage::pasteImage()
     QByteArray data = evaluateJavaScriptSync(page, "window.myImageDataURL").toByteArray();
     data.remove(0, data.indexOf(";base64,") + 8);
     QImage image = QImage::fromData(QByteArray::fromBase64(data), "PNG");
+    image.setColorSpace(origImage.colorSpace());
     if (image.format() == QImage::Format_RGB32)
         image.reinterpretAsFormat(QImage::Format_ARGB32);
     QCOMPARE(image, origImage);
-- 
cgit v1.2.3


From b3f7e2ae95ec839058a2a8f82b9b568a2e875a5e Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Wed, 23 Mar 2022 08:51:42 +0000
Subject: Fix build with libc++

Fix build with libc++ on linux by adding missing use_libcxx
parameter.

Check if re2 and poppler can be used as they use std::string in
their api. Add compiler test to check that.

Change-Id: I74bf79b8443ad470621c1a2e0c9dc768d4cca1f1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 288f60442fefa717dfc3c7587f1d480910b50874)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/printing/CMakeLists.txt   | 4 +---
 tests/auto/widgets/printing/tst_printing.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/printing/CMakeLists.txt b/tests/auto/widgets/printing/CMakeLists.txt
index e61b8cc89..9e14fd752 100644
--- a/tests/auto/widgets/printing/CMakeLists.txt
+++ b/tests/auto/widgets/printing/CMakeLists.txt
@@ -17,9 +17,7 @@ qt_internal_add_test(tst_printing
 )
 
 qt_internal_extend_target(tst_printing
-    CONDITION POPPLER_CPP_FOUND
-    DEFINES
-        POPPLER_CPP
+    CONDITION POPPLER_CPP_FOUND AND QT_FEATURE_webengine_system_poppler
     LIBRARIES
         PkgConfig::POPPLER_CPP
 )
diff --git a/tests/auto/widgets/printing/tst_printing.cpp b/tests/auto/widgets/printing/tst_printing.cpp
index 0559fb787..81d5d9442 100644
--- a/tests/auto/widgets/printing/tst_printing.cpp
+++ b/tests/auto/widgets/printing/tst_printing.cpp
@@ -27,13 +27,14 @@
 ****************************************************************************/
 
 #include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
+#include <QtWebEngineCore/qtwebenginecore-config.h>
 #include <QWebEngineView>
 #include <QTemporaryDir>
 #include <QTest>
 #include <QSignalSpy>
 #include <util.h>
 
-#if defined(POPPLER_CPP)
+#if QT_CONFIG(webengine_system_poppler)
 #include <poppler-document.h>
 #include <poppler-page.h>
 #endif
@@ -44,7 +45,7 @@ class tst_Printing : public QObject
 private slots:
     void printToPdfBasic();
     void printRequest();
-#if defined(POPPLER_CPP) && defined(Q_OS_LINUX) && defined(__GLIBCXX__)
+#if QT_CONFIG(webengine_system_poppler)
     void printToPdfPoppler();
 #endif
 };
@@ -110,7 +111,7 @@ void tst_Printing::printRequest()
      QVERIFY(data.length() > 0);
 }
 
-#if defined(POPPLER_CPP) && defined(Q_OS_LINUX) && defined(__GLIBCXX__)
+#if QT_CONFIG(webengine_system_poppler)
 void tst_Printing::printToPdfPoppler()
 {
     // check if generated pdf is correct by searching for a know string on the page
-- 
cgit v1.2.3


From 6ce62c241fbe108cd477905c16064c178215a227 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Thu, 24 Mar 2022 09:10:15 +0100
Subject: Resolve status code for http response with failure

All non-default https status codes are hidden under
net::ERR_HTTP_RESPONSE_CODE_FAILURE error of network stack. Handle
successful load case and set the real http status code for error.
Also set localized load error description only for http codes.

Fixes: QTBUG-46860
Fixes: QTBUG-61100
Task-number: QTBUG-94963
Change-Id: I81e083441d1814fb530f39ea3da1c4ef52b7da59
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit a4e32eac5cb858ffa5668b01cef10cc42854713b)
---
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 74 ++++++++++++++++++----
 1 file changed, 61 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 0daf0ce05..42e23e83b 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -233,26 +233,28 @@ void tst_LoadSignals::rejectNavigationRequest_data()
     QTest::addColumn<QUrl>("rejectedUrl");
     QTest::addColumn<int>("expectedNavigations");
     QTest::addColumn<QList<int>>("expectedSignals");
+    QTest::addColumn<int>("errorCode");
+    QTest::addColumn<QWebEngineLoadingInfo::ErrorDomain>("errorDomain");
     QTest::newRow("Simple")
             << QUrl("qrc:///resources/page1.html")
             << QUrl("qrc:///resources/page1.html")
-            << 1 << SignalsOrderOnceFailure;
+            << 1 << SignalsOrderOnceFailure << -3 << QWebEngineLoadingInfo::InternalErrorDomain;
     QTest::newRow("SamePageImmediate")
             << QUrl("qrc:///resources/page5.html")
             << QUrl("qrc:///resources/page5.html#anchor")
-            << 1 << SignalsOrderOnce;
+            << 1 << SignalsOrderOnce << 200 << QWebEngineLoadingInfo::InternalErrorDomain; // FIXME wrong error domain
     QTest::newRow("SamePageDeferred")
             << QUrl("qrc:///resources/page3.html")
             << QUrl("qrc:///resources/page3.html#anchor")
-            << 1 << SignalsOrderOnce;
+            << 1 << SignalsOrderOnce << 200 << QWebEngineLoadingInfo::InternalErrorDomain; // FIXME wrong error domain
     QTest::newRow("OtherPageImmediate")
             << QUrl("qrc:///resources/page6.html")
             << QUrl("qrc:///resources/page2.html#anchor")
-            << 2 << SignalsOrderOnceFailure;
+            << 2 << SignalsOrderOnceFailure << -3 << QWebEngineLoadingInfo::InternalErrorDomain;
     QTest::newRow("OtherPageDeferred")
             << QUrl("qrc:///resources/page7.html")
             << QUrl("qrc:///resources/page2.html#anchor")
-            << 2 << SignalsOrderTwiceWithFailure;
+            << 2 << SignalsOrderTwiceWithFailure << -3 << QWebEngineLoadingInfo::InternalErrorDomain;
 }
 
 /**
@@ -267,6 +269,8 @@ void tst_LoadSignals::rejectNavigationRequest()
     QFETCH(QUrl, rejectedUrl);
     QFETCH(int, expectedNavigations);
     QFETCH(QList<int>, expectedSignals);
+    QFETCH(int, errorCode);
+    QFETCH(QWebEngineLoadingInfo::ErrorDomain, errorDomain);
 
     page.blacklist.insert(rejectedUrl);
     page.load(initialUrl);
@@ -281,6 +285,8 @@ void tst_LoadSignals::rejectNavigationRequest()
     // No further loadStarted should have occurred within this time
     QCOMPARE(loadStartedSpy.size(), expectedLoadCount);
     QCOMPARE(loadFinishedSpy.size(), expectedLoadCount);
+    QCOMPARE(page.loadingInfos.last().errorCode(), errorCode);
+    QCOMPARE(page.loadingInfos.last().errorDomain(), errorDomain);
 }
 
 /**
@@ -368,6 +374,8 @@ void tst_LoadSignals::fileDownload()
     QTRY_LOOP_IMPL(loadStartedSpy.size() != 2 || loadFinishedSpy.size() != 2, 1000, 100);
 
     QCOMPARE(page.signalsOrder, SignalsOrderTwiceWithFailure);
+    QCOMPARE(page.loadingInfos[3].errorCode(), -3);
+    QCOMPARE(page.loadingInfos[3].errorDomain(), QWebEngineLoadingInfo::InternalErrorDomain);
 }
 
 void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame_data()
@@ -406,21 +414,27 @@ void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame()
     resetSpies();
     QTRY_LOOP_IMPL(loadStartedSpy.size() || loadFinishedSpy.size(), 1000, 100);
     QCOMPARE(page.signalsOrder, SignalsOrderOnce);
+    QCOMPARE(page.loadingInfos[1].errorCode(), 200);
+    QCOMPARE(page.loadingInfos[1].errorDomain(), QWebEngineLoadingInfo::InternalErrorDomain); // FIXME should be no error or separate domain?
 }
 
 void tst_LoadSignals::loadFinishedAfterNotFoundError_data()
 {
     QTest::addColumn<bool>("rfcInvalid");
     QTest::addColumn<bool>("withServer");
-    QTest::addRow("rfc_invalid")  << true  << false;
-    QTest::addRow("non_existent") << false << false;
-    QTest::addRow("server_404")   << false << true;
+    QTest::addColumn<int>("errorCode");
+    QTest::addColumn<int>("errorDomain");
+    QTest::addRow("rfc_invalid")  << true  << false << -105 << int(QWebEngineLoadingInfo::ConnectionErrorDomain);
+    QTest::addRow("non_existent") << false << false << -105 << int(QWebEngineLoadingInfo::ConnectionErrorDomain);
+    QTest::addRow("server_404")   << false << true  <<  404 << int(QWebEngineLoadingInfo::InternalErrorDomain); // FIXME should be no error or separate domain?
 }
 
 void tst_LoadSignals::loadFinishedAfterNotFoundError()
 {
-    QFETCH(bool, withServer);
     QFETCH(bool, rfcInvalid);
+    QFETCH(bool, withServer);
+    QFETCH(int, errorCode);
+    QFETCH(int, errorDomain);
 
     QScopedPointer<HttpServer> server;
     if (withServer) {
@@ -440,6 +454,19 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
     QVERIFY(std::is_sorted(page.loadProgress.begin(), page.loadProgress.end()));
     page.loadProgress.clear();
 
+    { auto &&loadStart = page.loadingInfos[0], &&loadFinish = page.loadingInfos[1];
+        QCOMPARE(loadStart.status(), QWebEngineLoadingInfo::LoadStartedStatus);
+        QCOMPARE(loadStart.isErrorPage(), false);
+        QCOMPARE(loadStart.errorCode(), 0);
+        QCOMPARE(loadStart.errorDomain(), QWebEngineLoadingInfo::NoErrorDomain);
+        QCOMPARE(loadStart.errorString(), QString());
+        QCOMPARE(loadFinish.status(), QWebEngineLoadingInfo::LoadFailedStatus);
+        QCOMPARE(loadFinish.isErrorPage(), false);
+        QCOMPARE(loadFinish.errorCode(), errorCode);
+        QCOMPARE(loadFinish.errorDomain(), errorDomain);
+        QVERIFY(!loadFinish.errorString().isEmpty());
+    }
+
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true);
     url = server
         ? server->url("/another-missing-one.html")
@@ -453,6 +480,19 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 3, 1000);
     QCOMPARE(loadStartedSpy.count(), 2);
     QVERIFY(std::is_sorted(page.loadProgress.begin(), page.loadProgress.end()));
+
+    { auto &&loadStart = page.loadingInfos[2], &&loadFinish = page.loadingInfos[3];
+        QCOMPARE(loadStart.status(), QWebEngineLoadingInfo::LoadStartedStatus);
+        QCOMPARE(loadStart.isErrorPage(), false);
+        QCOMPARE(loadStart.errorCode(), 0);
+        QCOMPARE(loadStart.errorDomain(), QWebEngineLoadingInfo::NoErrorDomain);
+        QCOMPARE(loadStart.errorString(), QString());
+        QCOMPARE(loadFinish.status(), QWebEngineLoadingInfo::LoadFailedStatus);
+        QCOMPARE(loadFinish.isErrorPage(), true);
+        QCOMPARE(loadFinish.errorCode(), errorCode);
+        QCOMPARE(loadFinish.errorDomain(), errorDomain);
+        QVERIFY(!loadFinish.errorString().isEmpty());
+    }
 }
 
 void tst_LoadSignals::errorPageTriggered_data()
@@ -460,10 +500,12 @@ void tst_LoadSignals::errorPageTriggered_data()
     QTest::addColumn<QString>("urlPath");
     QTest::addColumn<bool>("loadSucceed");
     QTest::addColumn<bool>("triggersErrorPage");
-    QTest::newRow("/content/200") << QStringLiteral("/content/200") << true << false;
-    QTest::newRow("/empty/200") << QStringLiteral("/content/200") << true << false;
-    QTest::newRow("/content/404") << QStringLiteral("/content/404") << false << false;
-    QTest::newRow("/empty/404") << QStringLiteral("/empty/404") << false << true;
+    QTest::addColumn<int>("errorCode");
+    QTest::addColumn<QWebEngineLoadingInfo::ErrorDomain>("errorDomain");
+    QTest::newRow("/content/200") << QStringLiteral("/content/200") << true << false << 200 << QWebEngineLoadingInfo::InternalErrorDomain;  // FIXME ?
+    QTest::newRow("/empty/200") << QStringLiteral("/content/200") << true << false << 200 << QWebEngineLoadingInfo::InternalErrorDomain;    // no error
+    QTest::newRow("/content/404") << QStringLiteral("/content/404") << false << false << 404 << QWebEngineLoadingInfo::InternalErrorDomain; // or
+    QTest::newRow("/empty/404") << QStringLiteral("/empty/404") << false << true << 404 << QWebEngineLoadingInfo::InternalErrorDomain;      // separate domain?
 }
 
 void tst_LoadSignals::errorPageTriggered()
@@ -490,6 +532,8 @@ void tst_LoadSignals::errorPageTriggered()
     QFETCH(QString, urlPath);
     QFETCH(bool, loadSucceed);
     QFETCH(bool, triggersErrorPage);
+    QFETCH(int, errorCode);
+    QFETCH(QWebEngineLoadingInfo::ErrorDomain, errorDomain);
 
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true);
     view.load(server.url(urlPath));
@@ -499,6 +543,8 @@ void tst_LoadSignals::errorPageTriggered()
         QVERIFY(toPlainTextSync(view.page()).contains("HTTP ERROR 404"));
     else
         QVERIFY(toPlainTextSync(view.page()).isEmpty());
+    QCOMPARE(page.loadingInfos[1].errorCode(), errorCode);
+    QCOMPARE(page.loadingInfos[1].errorDomain(), errorDomain);
     loadFinishedSpy.clear();
 
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
@@ -506,6 +552,8 @@ void tst_LoadSignals::errorPageTriggered()
     QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(loadFinishedSpy[0][0].toBool(), loadSucceed);
     QVERIFY(toPlainTextSync(view.page()).isEmpty());
+    QCOMPARE(page.loadingInfos[3].errorCode(), errorCode);
+    QCOMPARE(page.loadingInfos[3].errorDomain(), errorDomain);
     loadFinishedSpy.clear();
 }
 
-- 
cgit v1.2.3


From 8cc10f1d353bae0b25f6864054743d58225acc69 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 15 Mar 2022 15:00:15 +0100
Subject: Avoid crashing on context free web actions

If a web action that depends on a context is called, do nothing instead
of crashing.

Fixes: QTBUG-101724
Change-Id: I7a0040a58e9dc7fa14f0cae71cf1bcd086b61c54
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit e8e381119ca5b08add50d13ab9d275d9ab55471c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/core/devtools/tst_devtools.cpp          |  7 +++++
 .../widgets/qwebengineview/tst_qwebengineview.cpp  | 32 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/core/devtools/tst_devtools.cpp b/tests/auto/core/devtools/tst_devtools.cpp
index 3026b3931..064f95028 100644
--- a/tests/auto/core/devtools/tst_devtools.cpp
+++ b/tests/auto/core/devtools/tst_devtools.cpp
@@ -48,6 +48,9 @@ void tst_DevTools::attachAndDestroyPageFirst()
     page->load(QUrl("data:text/plain,foobarbaz"));
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
 
+    // shouldn't do anything until page is set
+    page->triggerAction(QWebEnginePage::InspectElement);
+
     inspector->setInspectedPage(page);
     page->triggerAction(QWebEnginePage::InspectElement);
 
@@ -62,6 +65,10 @@ void tst_DevTools::attachAndDestroyInspectorFirst()
 {
     // External inspector + manual destruction of inspector first
     QWebEnginePage* page = new QWebEnginePage();
+
+    // shouldn't do anything until page is set
+    page->triggerAction(QWebEnginePage::InspectElement);
+
     QWebEnginePage* inspector = new QWebEnginePage();
     inspector->setInspectedPage(page);
 
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index bbd1fbd16..e4df3f711 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -173,6 +173,7 @@ private Q_SLOTS:
     void setViewPreservesExplicitPage();
     void closeDiscardsPage();
     void loadAfterRendererCrashed();
+    void inspectElement();
 };
 
 // This will be called before the first test function is executed.
@@ -3481,5 +3482,36 @@ void tst_QWebEngineView::loadAfterRendererCrashed()
     QVERIFY(loadSpy.first().first().toBool());
 }
 
+void tst_QWebEngineView::inspectElement()
+{
+    QWebEngineView view;
+    view.resize(640, 480);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    auto page = view.page();
+    // shouldn't do anything until page is set
+    page->triggerAction(QWebEnginePage::InspectElement);
+    QTest::qWait(100);
+
+    QSignalSpy spy(&view, &QWebEngineView::loadFinished);
+    view.load(QUrl("data:text/plain,foobarbaz"));
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
+
+    // shouldn't do anything since inspector is not attached
+    page->triggerAction(QWebEnginePage::InspectElement);
+    QTest::qWait(100);
+
+    QWebEngineView inspectorView;
+    inspectorView.resize(640, 480);
+    inspectorView.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&inspectorView));
+    inspectorView.page()->setInspectedPage(page);
+
+    page->triggerAction(QWebEnginePage::InspectElement);
+    // TODO verify somehow
+    QTest::qWait(100);
+}
+
 QTEST_MAIN(tst_QWebEngineView)
 #include "tst_qwebengineview.moc"
-- 
cgit v1.2.3


From 03b8141000bf3bb2a661694956bf67e89fc72339 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 1 Apr 2022 14:30:16 +0200
Subject: Fix granted file access after local/remote access cleanup

We forgot to check for files specifically granted access to.
This blocked a number of features including dropping local files.

Task-number: QTBUG-102192
Change-Id: I5d34d9ba5351ec179df5896e64cc95c5481c7dc2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit 9a44b6ea5c60f83d841881b5ddbbaba79228fdea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebengineview/BLACKLIST        |  3 +++
 .../widgets/qwebengineview/tst_qwebengineview.cpp  | 30 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST
index eccf02971..99161a591 100644
--- a/tests/auto/widgets/qwebengineview/BLACKLIST
+++ b/tests/auto/widgets/qwebengineview/BLACKLIST
@@ -12,3 +12,6 @@ osx
 
 [reusePage]
 b2qt arm
+
+[navigateOnDrop]
+windows
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index e4df3f711..07d43a9b8 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -34,10 +34,12 @@
 #include <qtemporarydir.h>
 #include <QClipboard>
 #include <QCompleter>
+#include <QDropEvent>
 #include <QLabel>
 #include <QLineEdit>
 #include <QHBoxLayout>
 #include <QMenu>
+#include <QMimeData>
 #include <QQuickItem>
 #include <QQuickWidget>
 #include <QtWebEngineCore/qwebenginehttprequest.h>
@@ -174,6 +176,7 @@ private Q_SLOTS:
     void closeDiscardsPage();
     void loadAfterRendererCrashed();
     void inspectElement();
+    void navigateOnDrop();
 };
 
 // This will be called before the first test function is executed.
@@ -3513,5 +3516,32 @@ void tst_QWebEngineView::inspectElement()
     QTest::qWait(100);
 }
 
+void tst_QWebEngineView::navigateOnDrop()
+{
+    struct WebEngineView : QWebEngineView {
+        QWebEngineView* createWindow(QWebEnginePage::WebWindowType /* type */) override { return this; }
+    } view;
+    view.resize(640, 480);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    QSignalSpy loadSpy(&view, &QWebEngineView::loadFinished);
+    auto url = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).absoluteFilePath("resources/dummy.html"));
+    QMimeData mimeData;
+    mimeData.setUrls({ url });
+
+    auto sendEvents = [&] () {
+        QDragEnterEvent dee(view.rect().center(), Qt::CopyAction, &mimeData, Qt::LeftButton, Qt::NoModifier);
+        QApplication::sendEvent(&view, &dee);
+        QDropEvent de(view.rect().center(), Qt::CopyAction, &mimeData, Qt::LeftButton, Qt::NoModifier);
+        QApplication::sendEvent(&view, &de);
+    };
+
+    sendEvents();
+    QTRY_COMPARE(loadSpy.count(), 1);
+    QVERIFY(loadSpy.first().first().toBool());
+    QCOMPARE(view.url(), url);
+}
+
 QTEST_MAIN(tst_QWebEngineView)
 #include "tst_qwebengineview.moc"
-- 
cgit v1.2.3


From b596a82f449bf4b49c4809f271d5dd69b7902a95 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 6 Apr 2022 12:27:17 +0200
Subject: Fix navigation to non-local URLs

They are passed in another part of the DropItem object.

Task-number: QTBUG-102192
Change-Id: If52a88ce2688c25ea0edcc0d1e8f962f2cdd29dd
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit 742e6786aeb500ef9bc850bf84803d5f388e3927)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebengineview/BLACKLIST              |  2 +-
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST
index 99161a591..4bc678d10 100644
--- a/tests/auto/widgets/qwebengineview/BLACKLIST
+++ b/tests/auto/widgets/qwebengineview/BLACKLIST
@@ -13,5 +13,5 @@ osx
 [reusePage]
 b2qt arm
 
-[navigateOnDrop]
+[navigateOnDrop:file]
 windows
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 07d43a9b8..b4fa932dd 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -176,6 +176,7 @@ private Q_SLOTS:
     void closeDiscardsPage();
     void loadAfterRendererCrashed();
     void inspectElement();
+    void navigateOnDrop_data();
     void navigateOnDrop();
 };
 
@@ -3516,8 +3517,16 @@ void tst_QWebEngineView::inspectElement()
     QTest::qWait(100);
 }
 
+void tst_QWebEngineView::navigateOnDrop_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::newRow("file") << QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).absoluteFilePath("resources/dummy.html"));
+    QTest::newRow("qrc") << QUrl("qrc:///resources/dummy.html");
+}
+
 void tst_QWebEngineView::navigateOnDrop()
 {
+    QFETCH(QUrl, url);
     struct WebEngineView : QWebEngineView {
         QWebEngineView* createWindow(QWebEnginePage::WebWindowType /* type */) override { return this; }
     } view;
@@ -3526,7 +3535,6 @@ void tst_QWebEngineView::navigateOnDrop()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy loadSpy(&view, &QWebEngineView::loadFinished);
-    auto url = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).absoluteFilePath("resources/dummy.html"));
     QMimeData mimeData;
     mimeData.setUrls({ url });
 
-- 
cgit v1.2.3


From 568eba024aeabb942ed5d5c7d5741b5f2178d68f Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 22 Apr 2022 14:06:39 +0200
Subject: Fix touch input for html's popup in quick impl

Ammends 292f573f4e. Now that touch events are forwarded to popup
delegate also instead of synthesized mouse events, the bug with touch
event being ignored became present. Also extend testing of touch
events for html popups.

Task-number: QTBUG-79254
Fixes: QTBUG-103217
Change-Id: I097a6617493355c7603fef8eb41025e299a6e809
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 9334feb682db6e6e35bc98dce377a091eb640438)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tst_qquickwebengineview.cpp                    | 48 ++++++++++++++++----
 tests/auto/util/util.h                             | 24 +++-------
 .../widgets/qwebenginepage/tst_qwebenginepage.cpp  | 51 +++++++++++++++++-----
 tests/auto/widgets/touchinput/tst_touchinput.cpp   | 48 ++++++++++++++++++++
 4 files changed, 132 insertions(+), 39 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 347f370f7..2bfedd707 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -96,6 +96,7 @@ private Q_SLOTS:
     void setProfile();
     void focusChild();
     void focusChild_data();
+    void htmlSelectPopup();
 
 private:
     inline QQuickWebEngineView *newWebEngineView();
@@ -105,6 +106,11 @@ private:
     QString m_testSourceDirPath;
     QScopedPointer<TestWindow> m_window;
     QScopedPointer<QQmlComponent> m_component;
+
+     QPointingDevice *touchDevice() {
+         static auto d = QScopedPointer<QPointingDevice>(QTest::createTouchDevice());
+         return d.get();
+     }
 };
 
 tst_QQuickWebEngineView::tst_QQuickWebEngineView()
@@ -587,9 +593,8 @@ void tst_QQuickWebEngineView::interruptImeTextComposition()
         QTest::mouseClick(view->window(), Qt::LeftButton, {}, textInputCenter);
     } else if (eventType == "Touch") {
         QPoint textInputCenter = elementCenter(view, QStringLiteral("input2"));
-        QPointingDevice *touchDevice = QTest::createTouchDevice();
-        QTest::touchEvent(view->window(), touchDevice).press(0, textInputCenter, view->window());
-        QTest::touchEvent(view->window(), touchDevice).release(0, textInputCenter, view->window());
+        QTest::touchEvent(view->window(), touchDevice()).press(0, textInputCenter, view->window());
+        QTest::touchEvent(view->window(), touchDevice()).release(0, textInputCenter, view->window());
     }
     QTRY_COMPARE(evaluateJavaScriptSync(view, "document.activeElement.id").toString(), QStringLiteral("input2"));
 #ifndef Q_OS_WIN
@@ -987,11 +992,9 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress
     QTest::mousePress(view->window(), Qt::LeftButton);
     QTest::mouseRelease(view->window(), Qt::LeftButton);
 
-    QPointingDevice *device = QTest::createTouchDevice();
-
-    QTest::touchEvent(view->window(), device).press(0, QPoint(0,0), view->window());
-    QTest::touchEvent(view->window(), device).move(0, QPoint(1, 1), view->window());
-    QTest::touchEvent(view->window(), device).release(0, QPoint(1, 1), view->window());
+    QTest::touchEvent(view->window(), touchDevice()).press(0, QPoint(0,0), view->window());
+    QTest::touchEvent(view->window(), touchDevice()).move(0, QPoint(1, 1), view->window());
+    QTest::touchEvent(view->window(), touchDevice()).release(0, QPoint(1, 1), view->window());
 
     // We expect to catch 7 events - click = 2, press + release = 2, touches = 3.
     QCOMPARE(item.eventCount(), 7);
@@ -1170,6 +1173,8 @@ void tst_QQuickWebEngineView::setProfile() {
     QVERIFY(waitForLoadSucceeded(webEngineView()));
     QCOMPARE(loadSpy.size(), 4);
     QQuickWebEngineProfile *profile = new QQuickWebEngineProfile();
+    auto oldProfile = webEngineView()->profile();
+    auto sc = qScopeGuard([&] () { webEngineView()->setProfile(oldProfile); delete profile; });
     webEngineView()->setProfile(profile);
     QTRY_COMPARE(webEngineView()->url() ,urlFromTestPath("html/basic_page2.html"));
 }
@@ -1237,6 +1242,33 @@ void tst_QQuickWebEngineView::focusChild()
     QCOMPARE(traverseToWebDocumentAccessibleInterface(iface)->child(0)->child(0), iface->focusChild());
 }
 
+void tst_QQuickWebEngineView::htmlSelectPopup()
+{
+    m_window->show();
+    QQuickWebEngineView &view = *webEngineView();
+    view.settings()->setFocusOnNavigationEnabled(true);
+    view.setSize(QSizeF(640, 480));
+    view.loadHtml("<html><body>"
+                   "<select id='select' onchange='console.log(\"option changed to: \" + this.value)'>"
+                   "<option value='O1'>O1</option><option value='O2'>O2</option><option value='O3'>O3</option></select>"
+                   "</body></html>");
+    QVERIFY(waitForLoadSucceeded(&view));
+
+    auto makeTouch = [this] (QWindow *w, const QPoint &p) {
+        QTest::touchEvent(w, touchDevice()).press(1, p);
+        QTest::touchEvent(w, touchDevice()).release(1, p);
+    };
+
+    makeTouch(view.window(), elementCenter(&view, "select"));
+    QPointer<QQuickWindow> popup;
+    QTRY_VERIFY((popup = m_window->findChild<QQuickWindow *>()));
+    QCOMPARE(activeElementId(&view), QStringLiteral("select"));
+
+    makeTouch(popup, QPoint(popup->width() / 2, popup->height() / 2));
+    QTRY_VERIFY(!popup);
+    QCOMPARE(evaluateJavaScriptSync(&view, "document.getElementById('select').value").toString(), QStringLiteral("O2"));
+}
+
 static QByteArrayList params = QByteArrayList()
     << "--force-renderer-accessibility";
 
diff --git a/tests/auto/util/util.h b/tests/auto/util/util.h
index a624a978f..232d26d8f 100644
--- a/tests/auto/util/util.h
+++ b/tests/auto/util/util.h
@@ -175,31 +175,13 @@ static inline bool loadSync(QWebEnginePage *page, const QUrl &url, bool ok = tru
     return (!spy.empty() || spy.wait(20000)) && (spy.front().value(0).toBool() == ok);
 }
 
-static inline QPoint elementCenter(QWebEnginePage *page, const QString &id)
-{
-    const QString jsCode(
-            "(function(){"
-            "   var elem = document.getElementById('" + id + "');"
-            "   var rect = elem.getBoundingClientRect();"
-            "   return [(rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2];"
-            "})()");
-    QVariantList rectList = evaluateJavaScriptSync(page, jsCode).toList();
-
-    if (rectList.count() != 2) {
-        qWarning("elementCenter failed.");
-        return QPoint();
-    }
-
-    return QPoint(rectList.at(0).toInt(), rectList.at(1).toInt());
-}
-
 static inline QRect elementGeometry(QWebEnginePage *page, const QString &id)
 {
     const QString jsCode(
                 "(function() {"
                 "   var elem = document.getElementById('" + id + "');"
                 "   var rect = elem.getBoundingClientRect();"
-                "   return [rect.left, rect.top, rect.right, rect.bottom];"
+                "   return [rect.left, rect.top, rect.width, rect.height];"
                 "})()");
     QVariantList coords = evaluateJavaScriptSync(page, jsCode).toList();
 
@@ -211,5 +193,9 @@ static inline QRect elementGeometry(QWebEnginePage *page, const QString &id)
     return QRect(coords[0].toInt(), coords[1].toInt(), coords[2].toInt(), coords[3].toInt());
 }
 
+static inline QPoint elementCenter(QWebEnginePage *page, const QString &id)
+{
+    return elementGeometry(page, id).center();
+}
 
 #define W_QSKIP(a, b) QSKIP(a)
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 9ddd1eedb..f18fac8f8 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -96,7 +96,9 @@ public Q_SLOTS:
 private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
+    void comboBoxPopupPositionAfterMove_data();
     void comboBoxPopupPositionAfterMove();
+    void comboBoxPopupPositionAfterChildMove_data();
     void comboBoxPopupPositionAfterChildMove();
     void acceptNavigationRequest();
     void acceptNavigationRequestNavigationType();
@@ -262,6 +264,18 @@ private:
             + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
         return tmpd;
     }
+
+    QScopedPointer<QPointingDevice> s_touchDevice;
+    void makeClick(QWindow *window, bool withTouch = false, const QPoint &p = QPoint()) {
+        if (!withTouch) {
+            QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(), p);
+        } else {
+            if (!s_touchDevice)
+                s_touchDevice.reset(QTest::createTouchDevice());
+            QTest::touchEvent(window, s_touchDevice.get()).press(1, p);
+            QTest::touchEvent(window, s_touchDevice.get()).release(1, p);
+        }
+    };
 };
 
 tst_QWebEnginePage::tst_QWebEnginePage()
@@ -1299,6 +1313,13 @@ static QWindow *findNewTopLevelWindow(const QWindowList &oldTopLevelWindows)
     return nullptr;
 }
 
+void tst_QWebEnginePage::comboBoxPopupPositionAfterMove_data()
+{
+    QTest::addColumn<bool>("withTouch");
+    QTest::addRow("mouse") << false;
+    QTest::addRow("touch") << true;
+}
+
 void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
 {
     QWebEngineView view;
@@ -1312,9 +1333,10 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
                                "</select></body></html>"));
     QTRY_COMPARE(loadSpy.count(), 1);
     const auto oldTlws = QGuiApplication::topLevelWindows();
+
+    QFETCH(bool, withTouch);
     QWindow *window = view.windowHandle();
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(),
-                      elementCenter(view.page(), "foo"));
+    makeClick(window, withTouch, elementCenter(view.page(), "foo"));
 
     QWindow *popup = nullptr;
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
@@ -1323,7 +1345,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     QPoint popupPos = popup->position();
 
     // Close the popup by clicking somewhere into the page.
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(1, 1));
+    makeClick(window, withTouch, QPoint(1, 1));
     QTRY_VERIFY(!QGuiApplication::topLevelWindows().contains(popup));
 
     auto jsViewPosition = [&view]() {
@@ -1342,16 +1364,22 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     const QPoint offset(12, 13);
     view.move(view.pos() + offset);
     QTRY_COMPARE(jsViewPosition(), view.pos());
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(),
-                      elementCenter(view.page(), "foo"));
+    makeClick(window, withTouch, elementCenter(view.page(), "foo"));
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
     QTRY_VERIFY(!popup->position().isNull());
     QCOMPARE(popupPos + offset, popup->position());
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(1, 1));
+    makeClick(window, withTouch, QPoint(1, 1));
     QTRY_VERIFY(!QGuiApplication::topLevelWindows().contains(popup));
 }
 
+void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove_data()
+{
+    QTest::addColumn<bool>("withTouch");
+    QTest::addRow("mouse") << false;
+    QTest::addRow("touch") << true;
+}
+
 void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
 {
     QWidget mainWidget;
@@ -1374,9 +1402,10 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
                                "</select></body></html>"));
     QTRY_COMPARE(loadSpy.count(), 1);
     const auto oldTlws = QGuiApplication::topLevelWindows();
+
+    QFETCH(bool, withTouch);
     QWindow *window = view.window()->windowHandle();
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(),
-                      view.mapTo(view.window(), elementCenter(view.page(), "foo")));
+    makeClick(window, withTouch, view.mapTo(view.window(), elementCenter(view.page(), "foo")));
 
     QWindow *popup = nullptr;
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
@@ -1385,8 +1414,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     QPoint popupPos = popup->position();
 
     // Close the popup by clicking somewhere into the page.
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(),
-                      view.mapTo(view.window(), QPoint(1, 1)));
+    makeClick(window, withTouch, view.mapTo(view.window(), QPoint(1, 1)));
     QTRY_VERIFY(!QGuiApplication::topLevelWindows().contains(popup));
 
     int originalViewWidth = view.size().width();
@@ -1401,8 +1429,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     spacer.setMinimumWidth(spacer.size().width() + offset);
     QTRY_COMPARE(jsViewWidth(), originalViewWidth - offset);
 
-    QTest::mouseClick(window, Qt::LeftButton, Qt::KeyboardModifiers(),
-                      view.mapTo(view.window(), elementCenter(view.page(), "foo")));
+    makeClick(window, withTouch, view.mapTo(view.window(), elementCenter(view.page(), "foo")));
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
     QTRY_VERIFY(!popup->position().isNull());
     QCOMPARE(popupPos + QPoint(50, 0), popup->position());
diff --git a/tests/auto/widgets/touchinput/tst_touchinput.cpp b/tests/auto/widgets/touchinput/tst_touchinput.cpp
index d60fd1d7b..957f3e74c 100644
--- a/tests/auto/widgets/touchinput/tst_touchinput.cpp
+++ b/tests/auto/widgets/touchinput/tst_touchinput.cpp
@@ -37,6 +37,12 @@
 
 static QPointingDevice* s_touchDevice = nullptr;
 
+struct Page : QWebEnginePage
+{
+    QStringList alerts;
+    void javaScriptAlert(const QUrl &/*origin*/, const QString &msg) override { alerts.append(msg); }
+};
+
 class TouchInputTest : public QObject
 {
     Q_OBJECT
@@ -54,14 +60,23 @@ private Q_SLOTS:
     void pinchZoom_data();
     void pinchZoom();
     void complexSequence();
+    void buttonClickHandler();
+    void htmlSelectPopup();
 
 private:
+    Page page;
     QWebEngineView view;
     QSignalSpy loadSpy { &view, &QWebEngineView::loadFinished };
     QPoint notextCenter, textCenter, inputCenter;
 
     QString activeElement() { return evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(); }
 
+    void makeTouch(QWindow *w, const QPoint &p) {
+        QTest::touchEvent(w, s_touchDevice).press(1, p);
+        QTest::touchEvent(w, s_touchDevice).release(1, p);
+    }
+    void makeTouch(const QPoint &p) { makeTouch(view.windowHandle(), p); }
+
     void gestureScroll(bool down) {
         auto target = view.focusProxy();
         QPoint p(target->width() / 2, target->height() / 4 * (down ? 3 : 1));
@@ -131,6 +146,7 @@ void TouchInputTest::initTestCase()
 {
     s_touchDevice = QTest::createTouchDevice();
 
+    view.setPage(&page);
     view.settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, false);
 
     view.show(); view.resize(480, 320);
@@ -140,6 +156,9 @@ void TouchInputTest::initTestCase()
                  "<p id='text' style='width: 150px;'>The Qt Company</p>"
                  "<div id='notext' style='width: 150px; height: 100px; background-color: #f00;'></div>"
                  "<form><input id='input' width='150px' type='text' value='The Qt Company2' /></form>"
+                 "<button id='btn' type='button' onclick='alert(\"button clicked!\")'>Click Me!</button>"
+                 "<select id='select' onchange='alert(\"option changed to: \" + this.value)'>"
+                 "<option value='O1'>O1</option><option value='O2'>O2</option><option value='O3'>O3</option></select>"
                  "<table style='width: 100%; padding: 15px; text-align: center;'>"
                  "<tr><td>BEFORE</td><td><div class='rect' style='background-color: #00f;'></div></td><td>AFTER</td></tr>"
                  "<tr><td>BEFORE</td><td><div class='rect' style='background-color: #0f0;'></div></td><td>AFTER</td></tr>"
@@ -163,6 +182,7 @@ void TouchInputTest::cleanup()
     evaluateJavaScriptSync(view.page(), "window.scrollTo(0, 0)");
     QTRY_COMPARE(getScrollPosition(), 0);
     QTRY_COMPARE(pageScrollPosition(), 0);
+    page.alerts.clear();
 }
 
 void TouchInputTest::touchTap()
@@ -345,5 +365,33 @@ void TouchInputTest::complexSequence()
     }
 }
 
+void TouchInputTest::buttonClickHandler()
+{
+    auto buttonCenter = elementGeometry(view.page(), "btn").center();
+    makeTouch(buttonCenter);
+    QTRY_VERIFY(!page.alerts.isEmpty());
+    QCOMPARE(page.alerts.first(), "button clicked!");
+    QCOMPARE(page.alerts.size(), 1);
+    QEXPECT_FAIL("", "Shouldn't trigger twice due to synthesized mouse events for touch", Continue);
+    QTRY_VERIFY_WITH_TIMEOUT(page.alerts.size() == 2, 500);
+}
+
+void TouchInputTest::htmlSelectPopup()
+{
+    auto selectRect = elementGeometry(view.page(), "select");
+    makeTouch(selectRect.center());
+    QTRY_VERIFY(QApplication::activePopupWidget());
+    QCOMPARE(activeElement(), QStringLiteral("select"));
+
+    auto popup = QApplication::activePopupWidget();
+    makeTouch(popup->windowHandle(), QPoint(popup->width() / 2, popup->height() / 2));
+    QTRY_VERIFY(!QApplication::activePopupWidget());
+
+    QTRY_VERIFY(!page.alerts.isEmpty());
+    QCOMPARE(page.alerts.first(), "option changed to: O2");
+    QEXPECT_FAIL("", "Shouldn't trigger twice due to synthesized mouse events for touch", Continue);
+    QTRY_VERIFY_WITH_TIMEOUT(page.alerts.size() == 2, 500);
+}
+
 QTEST_MAIN(TouchInputTest)
 #include "tst_touchinput.moc"
-- 
cgit v1.2.3


From 6b8f8710ce3f6e277c9b392aa448325907f827ee Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Wed, 27 Apr 2022 22:22:46 +0200
Subject: Keep page's zoom level on loading new urls

Ammends d236c5a8a3. Zoom level was set as a temporal one, which is
invalidated each time when a renderer process or widget are changed
(on new navigation, for example), so it needs to be reapplied.

Fixes: QTBUG-101030
Change-Id: Iecff9686fbe2b79e99b46f67cab92f66127be085
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 1e27d42a8071532b6cc30a9bcc5f700edc56952a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tst_qquickwebengineview.cpp                    | 36 +++++++++++++---
 .../widgets/qwebenginepage/tst_qwebenginepage.cpp  | 50 ++++++++++++++++------
 2 files changed, 67 insertions(+), 19 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 2bfedd707..10aeede25 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -807,20 +807,44 @@ void tst_QQuickWebEngineView::inputMethodHints()
 void tst_QQuickWebEngineView::setZoomFactor()
 {
     QQuickWebEngineView *view = webEngineView();
+    m_window->show();
+    view->setSize(QSizeF(320, 240));
 
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 1.0));
+    QCOMPARE(view->zoomFactor(), 1.0);
     view->setZoomFactor(2.5);
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
 
-    view->setUrl(urlFromTestPath("html/basic_page.html"));
+    const QUrl url1 = urlFromTestPath("html/basic_page.html"), url2 = urlFromTestPath("html/basic_page2.html");
+
+    view->setUrl(url1);
     QVERIFY(waitForLoadSucceeded(view));
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
 
     view->setZoomFactor(0.1);
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
 
     view->setZoomFactor(5.5);
-    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+    QCOMPARE(view->zoomFactor(), 2.5);
+
+    QScopedPointer<QQuickWebEngineView> view2(newWebEngineView());
+    view2->setSize(QSizeF(320, 240));
+    view2->setParentItem(m_window->contentItem());
+
+    // try loading different url and check new values after load
+    for (auto &&p : {
+            qMakePair(view, 2.5), // navigating away to different url should keep zoom
+            qMakePair(view2.get(), 1.0), // same url navigation in diffent page shouldn't be affected
+        }) {
+        auto &&view = p.first; auto zoomFactor = p.second;
+        view->setUrl(url2);
+        QVERIFY(waitForLoadSucceeded(view));
+        QCOMPARE(view->zoomFactor(), zoomFactor);
+    }
+
+    // should have no influence on first page
+    view2->setZoomFactor(3.5);
+    for (auto &&p : { qMakePair(view, 2.5), qMakePair(view2.get(), 3.5), })
+        QCOMPARE(p.first->zoomFactor(), p.second);
 }
 
 void tst_QQuickWebEngineView::printToPdf()
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index f18fac8f8..227f33c17 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -80,6 +80,13 @@ static void removeRecursive(const QString& dirname)
     QDir().rmdir(dirname);
 }
 
+struct TestBasePage : QWebEnginePage
+{
+    explicit TestBasePage(QWebEngineProfile *profile, QObject *parent = nullptr) : QWebEnginePage(profile, parent) { }
+    explicit TestBasePage(QObject *parent = nullptr) : QWebEnginePage(parent) { }
+    QSignalSpy loadSpy { this, &QWebEnginePage::loadFinished };
+};
+
 class tst_QWebEnginePage : public QObject
 {
     Q_OBJECT
@@ -3128,25 +3135,42 @@ void tst_QWebEnginePage::toPlainTextLoadFinishedRace()
 
 void tst_QWebEnginePage::setZoomFactor()
 {
-    QWebEnginePage page;
+    TestBasePage page, page2;
 
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 1.0));
+    QCOMPARE(page.zoomFactor(), 1.0);
     page.setZoomFactor(2.5);
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
+    QCOMPARE(page.zoomFactor(), 2.5);
 
-    const QUrl urlToLoad("qrc:/resources/test1.html");
+    const QUrl url1("qrc:/resources/test1.html"), url2(QUrl("qrc:/resources/test2.html"));
 
-    QSignalSpy finishedSpy(&page, SIGNAL(loadFinished(bool)));
-    page.load(urlToLoad);
-    QTRY_COMPARE(finishedSpy.count(), 1);
-    QVERIFY(finishedSpy.at(0).first().toBool());
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
+    page.load(url1);
+    QTRY_COMPARE(page.loadSpy.count(), 1);
+    QVERIFY(page.loadSpy.at(0).first().toBool());
+    QCOMPARE(page.zoomFactor(), 2.5);
+
+    page.setZoomFactor(5.5); // max accepted zoom: kMaximumPageZoomFactor = 5.0
+    QCOMPARE(page.zoomFactor(), 2.5);
 
-    page.setZoomFactor(5.5);
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
+    page.setZoomFactor(0.1); // min accepted zoom: kMinimumPageZoomFactor = 0.25
+    QCOMPARE(page.zoomFactor(), 2.5);
+
+    // try loading different url and check new values after load
+    page.loadSpy.clear();
+    for (auto &&p : {
+            qMakePair(&page, 2.5), // navigating away to different url should keep zoom
+            qMakePair(&page2, 1.0), // same url navigation in diffent page shouldn't be affected
+        }) {
+        auto &&page = *p.first; auto zoomFactor = p.second;
+        page.load(url2);
+        QTRY_COMPARE(page.loadSpy.count(), 1);
+        QVERIFY(page.loadSpy.last().first().toBool());
+        QCOMPARE(page.zoomFactor(), zoomFactor);
+    }
 
-    page.setZoomFactor(0.1);
-    QVERIFY(qFuzzyCompare(page.zoomFactor(), 2.5));
+    // should have no influence on first page
+    page2.setZoomFactor(3.5);
+    for (auto &&p : { qMakePair(&page, 2.5), qMakePair(&page2, 3.5), })
+        QCOMPARE(p.first->zoomFactor(), p.second);
 }
 
 void tst_QWebEnginePage::mouseButtonTranslation()
-- 
cgit v1.2.3


From 8d0bd4b1a18ff886f360e71942f95858b5995ba3 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 24 May 2022 16:56:41 +0200
Subject: Fix local->remote user navigation

Specifically allow user initiated navigation of the mainframe.

Fixes: QTBUG-103778
Change-Id: I4e3d6b4fb606bd0c3cf66e090fba3c97c8c535b4
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 2ba1f04b4589e5883a399b022b7795266c4d4646)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../widgets/qwebenginepage/tst_qwebenginepage.cpp  | 65 ++++++++++++++++++++++
 1 file changed, 65 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 227f33c17..32f866810 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -257,6 +257,8 @@ private Q_SLOTS:
     void testChooseFilesParameters();
     void fileSystemAccessDialog();
 
+    void localToRemoteNavigation();
+
 private:
     static QPoint elementCenter(QWebEnginePage *page, const QString &id);
     static bool isFalseJavaScriptResult(QWebEnginePage *page, const QString &javaScript);
@@ -328,6 +330,14 @@ void tst_QWebEnginePage::initTestCase()
     QWebEngineUrlScheme echo("echo");
     echo.setSyntax(QWebEngineUrlScheme::Syntax::Path);
     QWebEngineUrlScheme::registerScheme(echo);
+
+    QWebEngineUrlScheme local("local");
+    local.setFlags(QWebEngineUrlScheme::LocalScheme);
+    QWebEngineUrlScheme::registerScheme(local);
+
+    QWebEngineUrlScheme remote("remote");
+    remote.setFlags(QWebEngineUrlScheme::CorsEnabled);
+    QWebEngineUrlScheme::registerScheme(remote);
 }
 
 void tst_QWebEnginePage::cleanupTestCase()
@@ -5010,6 +5020,61 @@ void tst_QWebEnginePage::isSafeRedirect()
     spy.clear();
 }
 
+class LocalRemoteUrlSchemeHandler : public QWebEngineUrlSchemeHandler
+{
+public:
+    LocalRemoteUrlSchemeHandler(QObject *parent = nullptr)
+        : QWebEngineUrlSchemeHandler(parent)
+    {
+    }
+    ~LocalRemoteUrlSchemeHandler() = default;
+
+    void requestStarted(QWebEngineUrlRequestJob *job) override
+    {
+        QBuffer *buffer = new QBuffer(job);
+        buffer->setData("<html><body><a href='remote://test.html' id='link'>Click link</a></body></html>");
+        job->reply("text/html", buffer);
+        loaded = true;
+    }
+    bool loaded = false;
+};
+
+void tst_QWebEnginePage::localToRemoteNavigation()
+{
+    LocalRemoteUrlSchemeHandler local;
+    LocalRemoteUrlSchemeHandler remote;
+    QWebEngineProfile profile;
+    profile.installUrlSchemeHandler("local", &local);
+    profile.installUrlSchemeHandler("remote", &remote);
+
+    QWebEnginePage page(&profile);
+    QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
+    QWebEngineView view;
+    view.resize(640, 480);
+    view.show();
+    view.setPage(&page);
+    page.setUrl(QUrl("local://test.html"));
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QVERIFY(local.loaded);
+
+    // Should navigate:
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, elementCenter(&page, "link"));
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 20000);
+    QVERIFY(remote.loaded);
+    local.loaded = false;
+    remote.loaded = false;
+
+    page.setUrl(QUrl("local://test.html"));
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 3, 20000);
+    QVERIFY(local.loaded && !remote.loaded);
+
+    // Should not navigate:
+    page.runJavaScript(QStringLiteral("document.getElementById(\"link\").click()"));
+    QTest::qWait(500);
+    QVERIFY(!remote.loaded);
+}
+
 static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
 W_QTEST_MAIN(tst_QWebEnginePage, params)
 
-- 
cgit v1.2.3


From 54918592e8c01474dbd0623e06e29a6ef1fcd8ff Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 31 May 2022 11:33:18 +0200
Subject: Fix assert after qtbase change

Avoid using high finger ids.

Task-number: QTBUG-103859
Change-Id: I4be5466b094dec1cc084ecb7ac61448a93c02637
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 1b13f421f1780bef806c5ccf96196c91c3864f04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/touchinput/tst_touchinput.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/touchinput/tst_touchinput.cpp b/tests/auto/widgets/touchinput/tst_touchinput.cpp
index 957f3e74c..e3ee9f933 100644
--- a/tests/auto/widgets/touchinput/tst_touchinput.cpp
+++ b/tests/auto/widgets/touchinput/tst_touchinput.cpp
@@ -81,17 +81,17 @@ private:
         auto target = view.focusProxy();
         QPoint p(target->width() / 2, target->height() / 4 * (down ? 3 : 1));
 
-        QTest::touchEvent(target, s_touchDevice).press(42, p, target);
+        QTest::touchEvent(target, s_touchDevice).press(1, p, target);
 
         QSignalSpy spy(view.page(), &QWebEnginePage::scrollPositionChanged);
         for (int i = 0; i < 3; ++i) {
             down ? p -= QPoint(5, 15) : p += QPoint(5, 15);
             QTest::qWait(100); // too fast and events are recognized as fling gesture
-            QTest::touchEvent(target, s_touchDevice).move(42, p, target);
+            QTest::touchEvent(target, s_touchDevice).move(1, p, target);
             spy.wait();
         }
 
-        QTest::touchEvent(target, s_touchDevice).release(42, p, target);
+        QTest::touchEvent(target, s_touchDevice).release(1, p, target);
     }
 
     void gesturePinch(bool zoomIn, bool tapOneByOne = false) {
@@ -100,10 +100,10 @@ private:
         auto t1 = p - QPoint(zoomIn ? 50 : 150, 10), t2 = p + QPoint(zoomIn ? 50 : 150, 10);
 
         if (tapOneByOne) {
-            QTest::touchEvent(target, s_touchDevice).press(42, t1, target);
-            QTest::touchEvent(target, s_touchDevice).stationary(42).press(24, t2, target);
+            QTest::touchEvent(target, s_touchDevice).press(0, t1, target);
+            QTest::touchEvent(target, s_touchDevice).stationary(0).press(1, t2, target);
         } else {
-            QTest::touchEvent(target, s_touchDevice).press(42, t1, target).press(24, t2, target);
+            QTest::touchEvent(target, s_touchDevice).press(0, t1, target).press(1, t2, target);
         }
 
         for (int i = 0; i < 3; ++i) {
@@ -115,14 +115,14 @@ private:
                 t2 -= QPoint(35, 5);
             }
             QTest::qWait(100); // too fast and events are recognized as fling gesture
-            QTest::touchEvent(target, s_touchDevice).move(24, t1, target).move(42, t2, target);
+            QTest::touchEvent(target, s_touchDevice).move(1, t1, target).move(0, t2, target);
         }
 
         if (tapOneByOne) {
-            QTest::touchEvent(target, s_touchDevice).stationary(42).release(24, t2, target);
-            QTest::touchEvent(target, s_touchDevice).release(42, t1, target);
+            QTest::touchEvent(target, s_touchDevice).stationary(0).release(1, t2, target);
+            QTest::touchEvent(target, s_touchDevice).release(0, t1, target);
         } else {
-            QTest::touchEvent(target, s_touchDevice).release(42, t1, target).release(24, t2, target);
+            QTest::touchEvent(target, s_touchDevice).release(0, t1, target).release(1, t2, target);
         }
     }
 
-- 
cgit v1.2.3


From b5a24ea21c00a597a2d4effd0f6fd70b78e48549 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 1 Jun 2022 17:19:19 +0200
Subject: Fix flakiness of jsServiceWorker test

This is an interesting issue as in the test sometimes first party
url of intercepted request has "sw.js" instead of "sw.html". After
deep debug of the issue the reason behind is that a service
worker registration job checks the registration for given scope
and the key, this in the turn will check storage in
ServiceWorkerStorage::FindRegistrationForScope. Now if registration
is found this will trigger service worker update checker,
which fires the request check for newer version for sw.js and makes
an intercepted request with sw.js as first party url. This of course
brakes the test.

Do not use the storage in that test, and let the service worker
registration job do full "install"  & "register" cycle instead
of running "update" phase.

As a side note , using off the record profile makes test run faster
as opening the storage and closing it is costly.

Change-Id: If13a4fcf0014cc5c76cb8ed14e60f2e5e29c67ef
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 53f3775a532c8a926f3c7ba7d1daf8ada72be306)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tst_qwebengineurlrequestinterceptor.cpp                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 14d045613..614d05d75 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -727,7 +727,7 @@ void tst_QWebEngineUrlRequestInterceptor::jsServiceWorker()
     server.setResourceDirs({ QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + "/resources" });
     QVERIFY(server.start());
 
-    QWebEngineProfile profile(QStringLiteral("Test"));
+    QWebEngineProfile profile;
     std::unique_ptr<ConsolePage> page;
     page.reset(new ConsolePage(&profile));
     TestRequestInterceptor interceptor(/* intercept */ false);
-- 
cgit v1.2.3


From d6f4bc46adebf795a5b71b49c94286367ef352e6 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 31 May 2022 13:08:05 +0200
Subject: Do not reset favicon for same document navigations

Fixes: QTBUG-103735
Change-Id: Iee0c09cde16a825097b7c1c014655476989922c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit c5de1b21232c7114b27e42fa8c15cb323d256e47)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/data/tst_favicon.qml | 32 ++++++++++++++++++++++
 tests/auto/widgets/favicon/tst_favicon.cpp     | 37 ++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index 79c835c70..ce4a2aa3c 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -165,6 +165,38 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
         }
 
+        function test_faviconLoadPushState_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_faviconLoadPushState(row) {
+            webEngineView.profile = row.profile;
+            compare(iconChangedSpy.count, 0);
+
+            var iconUrl;
+
+            webEngineView.url = Qt.resolvedUrl("favicon.html");
+            verify(webEngineView.waitForLoadSucceeded());
+            tryCompare(iconChangedSpy, "count", 1);
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon);
+            compare(iconUrl, Qt.resolvedUrl("icons/favicon.png"));
+
+            iconChangedSpy.clear();
+
+            // pushState() is a same document navigation and should not reset or
+            // update favicon.
+            compare(webEngineView.history.items.rowCount(), 1);
+            runJavaScript("history.pushState('', '')");
+            tryVerify(function() { return webEngineView.history.items.rowCount() === 2; });
+
+            // Favicon change is not expected.
+            compare(iconChangedSpy.count, 0);
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon);
+            compare(iconUrl, Qt.resolvedUrl("icons/favicon.png"));
+        }
 
         function test_noFavicon_data() {
             return [
diff --git a/tests/auto/widgets/favicon/tst_favicon.cpp b/tests/auto/widgets/favicon/tst_favicon.cpp
index d8b4803c0..6b5ae3c02 100644
--- a/tests/auto/widgets/favicon/tst_favicon.cpp
+++ b/tests/auto/widgets/favicon/tst_favicon.cpp
@@ -29,6 +29,7 @@
 #include <QtTest/QtTest>
 #include <util.h>
 
+#include <QWebEngineHistory>
 #include <QWebEnginePage>
 #include <QWebEngineProfile>
 #include <QWebEngineSettings>
@@ -49,6 +50,7 @@ private Q_SLOTS:
     void faviconLoadFromResources();
     void faviconLoadEncodedUrl();
     void faviconLoadAfterHistoryNavigation();
+    void faviconLoadPushState();
     void noFavicon();
     void aboutBlank();
     void unavailableFavicon();
@@ -222,6 +224,41 @@ void tst_Favicon::faviconLoadAfterHistoryNavigation()
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qtmulti.ico"));
 }
 
+void tst_Favicon::faviconLoadPushState()
+{
+    QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
+    QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
+    QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
+
+    QUrl url("qrc:/resources/favicon-single.html");
+    m_page->load(url);
+
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
+    QTRY_COMPARE(iconChangedSpy.count(), 1);
+
+    QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
+    QCOMPARE(iconUrl, m_page->iconUrl());
+    QCOMPARE(iconUrl, QUrl("qrc:/resources/icons/qt32.ico"));
+
+    const QIcon &icon = m_page->icon();
+    QVERIFY(!icon.isNull());
+
+    iconUrlChangedSpy.clear();
+    iconChangedSpy.clear();
+
+    // pushState() is a same document navigation and should not reset or
+    // update favicon.
+    QCOMPARE(m_page->history()->count(), 1);
+    evaluateJavaScriptSync(m_page, "history.pushState('', '')");
+    QTRY_COMPARE(m_page->history()->count(), 2);
+
+    // Favicon change is not expected.
+    QCOMPARE(iconUrlChangedSpy.count(), 0);
+    QCOMPARE(iconChangedSpy.count(), 0);
+    QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qt32.ico"));
+}
+
 void tst_Favicon::noFavicon()
 {
     if (!QDir(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()).exists())
-- 
cgit v1.2.3


From 3b3b9e736303fb39124397f9bc24f0c2d2f9ce5c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 9 May 2022 12:04:12 +0200
Subject: Create a RWHV delegate in core

This is adapting the Quick code for shared use with widgets,
and allows us to use it from QWebEnginePage.

Fixes: QTBUG-96377
Change-Id: I3f09c1a949eff86d80fbe6c513dc66e3f9f2f611
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 5d1ef38f9f6815807596d0606cf7ed06b7930aac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qquickwebengineview/tst_qquickwebengineview.cpp  |  4 +++-
 .../widgets/qwebenginepage/tst_qwebenginepage.cpp    |  5 ++++-
 .../widgets/qwebengineview/tst_qwebengineview.cpp    | 20 +++++++++++++++++++-
 .../auto/widgets/spellchecking/tst_spellchecking.cpp |  3 ++-
 4 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 10aeede25..c747e6b8f 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -463,7 +463,6 @@ void tst_QQuickWebEngineView::transparentWebEngineViews()
 void tst_QQuickWebEngineView::inputMethod()
 {
     m_window->show();
-    QTRY_VERIFY(qApp->focusObject());
     QQuickItem *input;
 
     QQuickWebEngineView *view = webEngineView();
@@ -471,18 +470,21 @@ void tst_QQuickWebEngineView::inputMethod()
     view->setUrl(urlFromTestPath("html/inputmethod.html"));
     QVERIFY(waitForLoadSucceeded(view));
 
+    QTRY_VERIFY(qobject_cast<QQuickItem *>(qApp->focusObject()));
     input = qobject_cast<QQuickItem *>(qApp->focusObject());
     QVERIFY(!input->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
     QVERIFY(!view->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
 
     runJavaScript("document.getElementById('inputField').focus();");
     QTRY_COMPARE(activeElementId(view), QStringLiteral("inputField"));
+    QTRY_VERIFY(qobject_cast<QQuickItem *>(qApp->focusObject()));
     input = qobject_cast<QQuickItem *>(qApp->focusObject());
     QTRY_VERIFY(input->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
     QVERIFY(view->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
 
     runJavaScript("document.getElementById('inputField').blur();");
     QTRY_VERIFY(activeElementId(view).isEmpty());
+    QTRY_VERIFY(qobject_cast<QQuickItem *>(qApp->focusObject()));
     input = qobject_cast<QQuickItem *>(qApp->focusObject());
     QTRY_VERIFY(!input->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
     QVERIFY(!view->flags().testFlag(QQuickItem::ItemAcceptsInputMethod));
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 57f6b24a8..63d39dd59 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1441,15 +1441,18 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
         return viewWidth;
     };
 
+    QCOMPARE(jsViewWidth(), originalViewWidth);
+
     // Resize the "spacer" widget, and implicitly change the global position of the QWebEngineView.
     const int offset = 50;
     spacer.setMinimumWidth(spacer.size().width() + offset);
+
     QTRY_COMPARE(jsViewWidth(), originalViewWidth - offset);
 
     makeClick(window, withTouch, view.mapTo(view.window(), elementCenter(view.page(), "foo")));
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
     QTRY_VERIFY(!popup->position().isNull());
-    QCOMPARE(popupPos + QPoint(50, 0), popup->position());
+    QCOMPARE(popupPos + QPoint(offset, 0), popup->position());
 }
 
 #ifdef Q_OS_MAC
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 921b0c52f..883720490 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -106,6 +106,7 @@ private Q_SLOTS:
     void changePage();
     void reusePage_data();
     void reusePage();
+    void setLoadedPage();
     void microFocusCoordinates();
     void focusInputTypes();
     void unhandledKeyEventPropagation();
@@ -399,7 +400,7 @@ void tst_QWebEngineView::reusePage()
     view1->show();
     QVERIFY(QTest::qWaitForWindowExposed(view1));
     delete view1;
-    QVERIFY(page != 0); // deleting view must not have deleted the page, since it's not a child of view
+    QVERIFY(page != nullptr); // deleting view must not have deleted the page, since it's not a child of view
 
     QWebEngineView *view2 = new QWebEngineView;
     view2->setPage(page.data());
@@ -412,6 +413,23 @@ void tst_QWebEngineView::reusePage()
     QDir::setCurrent(QApplication::applicationDirPath());
 }
 
+void tst_QWebEngineView::setLoadedPage()
+{
+    // MEMO load page first to make sure that just simple attach to view would draw its content
+    QWebEnginePage page;
+    QSignalSpy loadSpy(&page, &QWebEnginePage::loadFinished);
+    page.setHtml(QString("<html><body bgcolor=\"%1\"></body></html>").arg(QColor(Qt::yellow).name()));
+    QTRY_VERIFY(loadSpy.count() == 1 && loadSpy.first().first().toBool());
+
+    QWebEngineView view;
+    view.resize(480, 320);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    view.setPage(&page);
+    QTRY_COMPARE(view.grab().toImage().pixelColor(QPoint(view.width() / 2, view.height() / 2)), Qt::yellow);
+}
+
 // Class used in crashTests
 class WebViewCrashTest : public QObject {
     Q_OBJECT
diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
index 7263904ce..738010ac8 100644
--- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
@@ -170,6 +170,7 @@ void tst_Spellchecking::spellcheck()
     QVariantList list = evaluateJavaScriptSync(m_view->page(), "findWordPosition('I lowe Qt ....','lowe');").toList();
     QRect rect(list[0].value<int>(),list[1].value<int>(),list[2].value<int>(),list[3].value<int>());
 
+    QTRY_VERIFY(m_view->focusWidget());
     //type text, spellchecker needs time
     QTest::mouseMove(m_view->focusWidget(), QPoint(20,20));
     QTest::mousePress(m_view->focusWidget(), Qt::LeftButton, {}, QPoint(20,20));
@@ -182,7 +183,7 @@ void tst_Spellchecking::spellcheck()
 
     // make sure text is there
     QString result = evaluateJavaScriptSync(m_view->page(), "text();").toString();
-    QVERIFY(result == text);
+    QCOMPARE(result, text);
 
     bool gotMisspelledWord = false; // clumsy QTRY_VERIFY still execs expr after first success
     QString detail;
-- 
cgit v1.2.3


From bc71208b2b21d1996cb95d615a6bf74c16d28524 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 9 Jun 2022 11:58:41 +0200
Subject: Switch from QT_NO macros to feature checks

This is safer by ensuring we are checking for a feature that is defined.

For some reason, the openssl feature is a private feature, so we need
to include the private header to access it.

Change-Id: Idf7f3baba33e5188f206f5be1b8a0bfd75e79d03
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit be4c684be7c2fa91f7df3d7cccfb6999aecfc967)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebenginepage/CMakeLists.txt         | 1 +
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 5 +++--
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/CMakeLists.txt b/tests/auto/widgets/qwebenginepage/CMakeLists.txt
index bb31d9a97..599e22990 100644
--- a/tests/auto/widgets/qwebenginepage/CMakeLists.txt
+++ b/tests/auto/widgets/qwebenginepage/CMakeLists.txt
@@ -5,6 +5,7 @@ qt_internal_add_test(tst_qwebenginepage
     SOURCES
         tst_qwebenginepage.cpp
     LIBRARIES
+        Qt::NetworkPrivate
         Qt::WebEngineWidgets
         Test::HttpServer
         Test::Util
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 63d39dd59..b8c0dd5f0 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -47,6 +47,7 @@
 #include <qnetworkcookiejar.h>
 #include <qnetworkreply.h>
 #include <qnetworkrequest.h>
+#include <QtNetwork/private/qtnetwork-config_p.h>
 #include <qwebenginedownloadrequest.h>
 #include <qwebenginefilesystemaccessrequest.h>
 #include <qwebenginefindtextresult.h>
@@ -2151,7 +2152,7 @@ public:
             setAttribute(QNetworkRequest::RedirectionTargetAttribute, QUrl("qrc:/test2.html"));
             QTimer::singleShot(0, this, SLOT(continueRedirect()));
         }
-#ifndef QT_NO_OPENSSL
+#if QT_CONFIG(openssl)
         else if (request.url() == QUrl("qrc:/fake-ssl-error.html")) {
             setError(QNetworkReply::SslHandshakeFailedError, tr("Fake error!"));
             QTimer::singleShot(0, this, SLOT(continueError()));
@@ -2208,7 +2209,7 @@ protected:
     {
         QString url = request.url().toString();
         if (op == QNetworkAccessManager::GetOperation) {
-#ifndef QT_NO_OPENSSL
+#if QT_CONFIG(openssl)
             if (url == "qrc:/fake-ssl-error.html") {
                 FakeReply* reply = new FakeReply(request, this);
                 QList<QSslError> errors;
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 883720490..40c99c6e0 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -152,7 +152,7 @@ private Q_SLOTS:
 
     void mouseLeave();
 
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
     void globalMouseSelection();
 #endif
     void noContextMenu();
@@ -927,7 +927,7 @@ public:
         case QEvent::ContextMenu:
         case QEvent::KeyPress:
         case QEvent::KeyRelease:
-#ifndef QT_NO_WHEELEVENT
+#if QT_CONFIG(wheelevent)
         case QEvent::Wheel:
 #endif
             ++m_eventCounter;
@@ -2967,7 +2967,7 @@ void tst_QWebEngineView::imeCompositionQueryEvent()
     QTRY_COMPARE(anchorPosQuery.value(Qt::ImAnchorPosition).toInt(), 11);
 }
 
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
 void tst_QWebEngineView::globalMouseSelection()
 {
     if (!QApplication::clipboard()->supportsSelection()) {
-- 
cgit v1.2.3


From 1bbf1d2d15d5ca11575141b8059e4c5214e7d2c4 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 31 May 2022 13:08:05 +0200
Subject: Do not reset favicon for same document navigations

Fixes: QTBUG-103735
Change-Id: Iee0c09cde16a825097b7c1c014655476989922c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit c5de1b21232c7114b27e42fa8c15cb323d256e47)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/data/tst_favicon.qml | 32 ++++++++++++++++++++++
 tests/auto/widgets/favicon/tst_favicon.cpp     | 37 ++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index 79c835c70..ce4a2aa3c 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -165,6 +165,38 @@ TestWebEngineView {
             compare(iconUrl, Qt.resolvedUrl("icons/qt32.ico"))
         }
 
+        function test_faviconLoadPushState_data() {
+            return [
+                   { tag: "OTR", profile: defaultProfile },
+                   { tag: "non-OTR", profile: nonOTRProfile },
+            ];
+        }
+
+        function test_faviconLoadPushState(row) {
+            webEngineView.profile = row.profile;
+            compare(iconChangedSpy.count, 0);
+
+            var iconUrl;
+
+            webEngineView.url = Qt.resolvedUrl("favicon.html");
+            verify(webEngineView.waitForLoadSucceeded());
+            tryCompare(iconChangedSpy, "count", 1);
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon);
+            compare(iconUrl, Qt.resolvedUrl("icons/favicon.png"));
+
+            iconChangedSpy.clear();
+
+            // pushState() is a same document navigation and should not reset or
+            // update favicon.
+            compare(webEngineView.history.items.rowCount(), 1);
+            runJavaScript("history.pushState('', '')");
+            tryVerify(function() { return webEngineView.history.items.rowCount() === 2; });
+
+            // Favicon change is not expected.
+            compare(iconChangedSpy.count, 0);
+            iconUrl = removeFaviconProviderPrefix(webEngineView.icon);
+            compare(iconUrl, Qt.resolvedUrl("icons/favicon.png"));
+        }
 
         function test_noFavicon_data() {
             return [
diff --git a/tests/auto/widgets/favicon/tst_favicon.cpp b/tests/auto/widgets/favicon/tst_favicon.cpp
index d8b4803c0..6b5ae3c02 100644
--- a/tests/auto/widgets/favicon/tst_favicon.cpp
+++ b/tests/auto/widgets/favicon/tst_favicon.cpp
@@ -29,6 +29,7 @@
 #include <QtTest/QtTest>
 #include <util.h>
 
+#include <QWebEngineHistory>
 #include <QWebEnginePage>
 #include <QWebEngineProfile>
 #include <QWebEngineSettings>
@@ -49,6 +50,7 @@ private Q_SLOTS:
     void faviconLoadFromResources();
     void faviconLoadEncodedUrl();
     void faviconLoadAfterHistoryNavigation();
+    void faviconLoadPushState();
     void noFavicon();
     void aboutBlank();
     void unavailableFavicon();
@@ -222,6 +224,41 @@ void tst_Favicon::faviconLoadAfterHistoryNavigation()
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qtmulti.ico"));
 }
 
+void tst_Favicon::faviconLoadPushState()
+{
+    QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
+    QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
+    QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
+
+    QUrl url("qrc:/resources/favicon-single.html");
+    m_page->load(url);
+
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
+    QTRY_COMPARE(iconChangedSpy.count(), 1);
+
+    QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
+    QCOMPARE(iconUrl, m_page->iconUrl());
+    QCOMPARE(iconUrl, QUrl("qrc:/resources/icons/qt32.ico"));
+
+    const QIcon &icon = m_page->icon();
+    QVERIFY(!icon.isNull());
+
+    iconUrlChangedSpy.clear();
+    iconChangedSpy.clear();
+
+    // pushState() is a same document navigation and should not reset or
+    // update favicon.
+    QCOMPARE(m_page->history()->count(), 1);
+    evaluateJavaScriptSync(m_page, "history.pushState('', '')");
+    QTRY_COMPARE(m_page->history()->count(), 2);
+
+    // Favicon change is not expected.
+    QCOMPARE(iconUrlChangedSpy.count(), 0);
+    QCOMPARE(iconChangedSpy.count(), 0);
+    QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qt32.ico"));
+}
+
 void tst_Favicon::noFavicon()
 {
     if (!QDir(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()).exists())
-- 
cgit v1.2.3


From ab73b08e4187ec29fee56372ec75ec985a57a4da Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Sun, 5 Jun 2022 14:28:08 +0000
Subject: Revert "Skip tst_UIDelegates::contextMenu on macOS"

This reverts commit af4f03f51fc647c48968e149799cd35ab161dc55.

Reason for revert: crashes anyway, somehow

Task-number: QTBUG-103354
Change-Id: I6f3119f855ce485668d9541c323dee947df93b60
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit a4099cdd2aa657e75dfa27ab06247052254920bc)
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 tests/auto/quick/uidelegates/tst_uidelegates.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/uidelegates/tst_uidelegates.cpp b/tests/auto/quick/uidelegates/tst_uidelegates.cpp
index cbf14a186..4c2fa3b3c 100644
--- a/tests/auto/quick/uidelegates/tst_uidelegates.cpp
+++ b/tests/auto/quick/uidelegates/tst_uidelegates.cpp
@@ -159,9 +159,6 @@ void tst_UIDelegates::fileDialog()
 
 void tst_UIDelegates::contextMenu()
 {
-#ifdef Q_OS_MACOS
-    QSKIP("Failing on macOS (QTBUG-103354)");
-#endif
     m_window->show();
     QTRY_VERIFY(qApp->focusObject());
     QQuickWebEngineView *view = webEngineView();
-- 
cgit v1.2.3


From ee7ec6ec26a89255d8753e9a94d3954f2d55443d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 10 Jun 2022 15:21:49 +0200
Subject: Avoid extra window after change of page

A widget created for an item in a viewless page, still needs to be
tracked as a widget.

Change-Id: I9d571916b28b1cb2b8bd184d008255b9af105c33
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit d12adcd84d9246e029b9a8340da4545a1f1797ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 40c99c6e0..80da4664c 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -201,6 +201,7 @@ void tst_QWebEngineView::init()
 // This will be called after every test function.
 void tst_QWebEngineView::cleanup()
 {
+    QTRY_COMPARE(QApplication::topLevelWidgets().size(), 0);
 }
 
 void tst_QWebEngineView::renderHints()
-- 
cgit v1.2.3


From f13ae31ea24d2766f57990e5c143c2088fc87065 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 3 Jun 2022 10:56:50 +0200
Subject: Update Chromium

Submodule src/3rdparty 6559e00a3..88398c89a7b:
  > Fix broken bundled zlib for cross compilation
  > FIXUP: Fix url_utils for QtWebEngine
  > Make sure we do not compile minizip from 3rdparty
  > Trim down some dependencies of push messaging

Change-Id: I3062f536fd144d00f72ea783ddcc56931a46a98f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit f5207d2012efe408f178496b2023d822b33a6474)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index b8c0dd5f0..262e1ea8d 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -5028,7 +5028,7 @@ void tst_QWebEnginePage::isSafeRedirect_data()
     fileScheme += "/";
 #endif
 
-    QString tempDir(fileScheme + QDir::tempPath());
+    QString tempDir(fileScheme + QDir::tempPath() + "/");
     QTest::newRow(qPrintable(tempDir)) << QUrl(tempDir) << QUrl(tempDir);
     QTest::newRow(qPrintable(tempDir + QString("/foo/bar"))) << QUrl(tempDir + "/foo/bar") << QUrl(tempDir + "/foo/bar");
     QTest::newRow("filesystem:http://foo.com/bar") << QUrl("filesystem:http://foo.com/bar") << QUrl("filesystem:http://foo.com/bar/");
-- 
cgit v1.2.3


From dd078be36bc3f4923d0589ef7fcb113f61fa77da Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 2 Jun 2022 08:06:52 +0200
Subject: Prove that the service worker works with otr profile

Check registration installation and activation of service worker
and add basic message ping pong test.

Change-Id: Ia446553ccbc62b45a5d6313cbbdf15108adcdd36
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 10b4b06d28dbeb0de67edcb94eb85df4d70e4f55)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../resources/sw.html                              | 39 ++++++++++++++++++----
 .../resources/sw.js                                | 15 ++++++++-
 .../tst_qwebengineurlrequestinterceptor.cpp        | 12 +++++--
 3 files changed, 56 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.html b/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.html
index af44b45a2..fc3d9ded4 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.html
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.html
@@ -2,13 +2,40 @@
 <html>
   <body>
     <script>
+      function logState(state) {
+         console.log("Service worker " + state)
+      }
+
+      const registerServiceWorker = async () => {
+          try {
+            var serviceWorker;
+            const registration = await navigator.serviceWorker.register('/sw.js');
+            if (registration.installing) {
+              serviceWorker = registration.installing;
+            } else if (registration.waiting) {
+              serviceWorker = registration.waiting;
+            } else if (registration.active) {
+              serviceWorker = registration.active;
+            }
+          } catch (error) {
+            console.error("Service worker registration error: ${error}");
+          }
+          if (serviceWorker) {
+            logState(serviceWorker.state);
+            serviceWorker.addEventListener('statechange', function(e) {
+            logState(e.target.state);
+            });
+          }
+      };
       if ('serviceWorker' in navigator) {
-        window.addEventListener('load', function() {
-          navigator.serviceWorker.register('/sw.js').then(function(registration) {
-            console.log('ServiceWorker registration successful with scope: ', registration.scope);
-          }, function(err) {
-            console.error('ServiceWorker registration failed: ', err);
-          });
+        registerServiceWorker();
+        navigator.serviceWorker.ready.then((registration) => {
+          navigator.serviceWorker.onmessage = (event) => {
+            if (event.data && event.data.type === 'PONG') {
+                console.log("Service worker done");
+            }
+          };
+          registration.active.postMessage({type: 'PING'});
         });
       }
     </script>
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.js b/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.js
index 2216e2a07..196a9ad67 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.js
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/resources/sw.js
@@ -1,3 +1,16 @@
 self.addEventListener('install', function(event) {
-  console.log('ServiceWorker installed');
+    event.waitUntil(self.skipWaiting());
+});
+
+self.addEventListener('activate', function(event) {
+    event.waitUntil(self.clients.claim());
+});
+self.addEventListener('message', (event) => {
+    if (event.data && event.data.type === 'PING') {
+        self.clients.matchAll({includeUncontrolled: true, type: 'window'}).then((clients) => {
+            if (clients && clients.length) {
+                clients[0].postMessage({type: 'PONG'});
+            }
+        });
+    }
 });
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index a3f3cc3e3..79cbb5421 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -726,7 +726,6 @@ void tst_QWebEngineUrlRequestInterceptor::jsServiceWorker()
     HttpServer server;
     server.setResourceDirs({ QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + "/resources" });
     QVERIFY(server.start());
-
     QWebEngineProfile profile;
     std::unique_ptr<ConsolePage> page;
     page.reset(new ConsolePage(&profile));
@@ -735,9 +734,16 @@ void tst_QWebEngineUrlRequestInterceptor::jsServiceWorker()
     QVERIFY(loadSync(page.get(), server.url("/sw.html")));
 
     // We expect only one message here, because logging of services workers is not exposed in our API.
-    QTRY_COMPARE_WITH_TIMEOUT(page->messages.count(), 1, 20000);
-    QCOMPARE(page->levels.at(0), QWebEnginePage::InfoMessageLevel);
+    // Note this is very fragile setup , you need fresh profile otherwise install event might not get triggered
+    // and this in turn can lead to incorrect intercepted requests, therefore we should keep this off the record.
+    QTRY_COMPARE_WITH_TIMEOUT(page->messages.count(), 5, 20000);
 
+    QCOMPARE(page->levels.at(0), QWebEnginePage::InfoMessageLevel);
+    QCOMPARE(page->messages.at(0),QLatin1String("Service worker installing"));
+    QCOMPARE(page->messages.at(1),QLatin1String("Service worker installed"));
+    QCOMPARE(page->messages.at(2),QLatin1String("Service worker activating"));
+    QCOMPARE(page->messages.at(3),QLatin1String("Service worker activated"));
+    QCOMPARE(page->messages.at(4),QLatin1String("Service worker done"));
     QUrl firstPartyUrl = QUrl(server.url().toString() + "sw.html");
     QList<RequestInfo> infos;
     // Service Worker
-- 
cgit v1.2.3


From bcbae201485f921addbc012418295424dfba3b25 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 3 Jun 2022 15:49:19 +0200
Subject: Test local, secure and file redirects

Task-number: QTBUG-99207
Change-Id: I28a3d06f97c0973ccc0f23bd90de58e89b19eb7a
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit e2d3beb65653bb96342a80b436d8935e903fdd70)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/core/origins/resources/redirect.css  |   7 +-
 tests/auto/core/origins/resources/redirect.html |   9 +-
 tests/auto/core/origins/tst_origins.cpp         | 192 +++++++++++++++++++++---
 3 files changed, 178 insertions(+), 30 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/origins/resources/redirect.css b/tests/auto/core/origins/resources/redirect.css
index 9c4308c07..a6a03d8f5 100644
--- a/tests/auto/core/origins/resources/redirect.css
+++ b/tests/auto/core/origins/resources/redirect.css
@@ -1,8 +1,3 @@
-@font-face {
-    font-family: 'MyWebFont';
-    src: url('redirect:redirect-secure/resources/Akronim-Regular.woff2') format('woff2');
-}
-
 body {
-    font-family: 'MyWebFont', Fallback, sans-serif;
+    font-family: serif;
 }
diff --git a/tests/auto/core/origins/resources/redirect.html b/tests/auto/core/origins/resources/redirect.html
index bc4a9b80e..603cb76f0 100644
--- a/tests/auto/core/origins/resources/redirect.html
+++ b/tests/auto/core/origins/resources/redirect.html
@@ -2,7 +2,14 @@
 <html>
     <head>
         <title>redirect</title>
-        <link rel="stylesheet" href="redirect:redirect-secure/resources/redirect.css">
+        <script>
+            function addStylesheetLink(src) {
+                let link = document.createElement('link');
+                link.rel = 'stylesheet';
+                link.href = src;
+                document.getElementsByTagName("head")[0].appendChild(link);
+             }
+        </script>
     </head>
     <body>
         Text
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 6600bbc33..dc6c57e2a 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -139,11 +139,22 @@ void registerSchemes()
         QWebEngineUrlScheme::registerScheme(scheme);
     }
 
+    {
+        QWebEngineUrlScheme scheme(QBAL("redirect-local"));
+        scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed);
+        QWebEngineUrlScheme::registerScheme(scheme);
+    }
+
     {
         QWebEngineUrlScheme scheme(QBAL("cors"));
         scheme.setFlags(QWebEngineUrlScheme::CorsEnabled);
         QWebEngineUrlScheme::registerScheme(scheme);
     }
+    {
+        QWebEngineUrlScheme scheme(QBAL("secure-cors"));
+        scheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::CorsEnabled);
+        QWebEngineUrlScheme::registerScheme(scheme);
+    }
     {
         QWebEngineUrlScheme scheme(QBAL("localaccess"));
         scheme.setFlags(QWebEngineUrlScheme::LocalAccessAllowed);
@@ -190,7 +201,9 @@ public:
         profile->installUrlSchemeHandler(QBAL("HostPortAndUserInformationSyntax"), this);
         profile->installUrlSchemeHandler(QBAL("redirect"), this);
         profile->installUrlSchemeHandler(QBAL("redirect-secure"), this);
+        profile->installUrlSchemeHandler(QBAL("redirect-local"), this);
         profile->installUrlSchemeHandler(QBAL("cors"), this);
+        profile->installUrlSchemeHandler(QBAL("secure-cors"), this);
         profile->installUrlSchemeHandler(QBAL("localaccess"), this);
         profile->installUrlSchemeHandler(QBAL("local"), this);
         profile->installUrlSchemeHandler(QBAL("local-localaccess"), this);
@@ -310,7 +323,13 @@ private Q_SLOTS:
     void viewSource();
     void createObjectURL();
     void redirectScheme();
+    void redirectSchemeLocal();
+    void redirectSchemeSecure();
     void redirectInterceptor();
+    void redirectInterceptorLocal();
+    void redirectInterceptorSecure();
+    void redirectInterceptorFile();
+    void redirectInterceptorHttp();
 
 private:
     bool verifyLoad(const QUrl &url)
@@ -1264,15 +1283,39 @@ void tst_Origins::createObjectURL()
 
 void tst_Origins::redirectScheme()
 {
-    QVERIFY(verifyLoad(QSL("redirect:redirect-secure/resources/redirect.html")));
-    QTRY_COMPARE(m_handler->requests().size(), 7);
-    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.html")));
-    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("redirect-secure:/resources/redirect.html")));
-    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.css")));
-    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("redirect-secure:/resources/redirect.css")));
-    QCOMPARE(m_handler->requests()[4], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(m_handler->requests()[5], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(m_handler->requests()[6], QUrl(QStringLiteral("redirect-secure:/resources/Akronim-Regular.woff2")));
+    QVERIFY(verifyLoad(QSL("redirect:cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect:cors/resources/redirect.css')");
+    QTRY_COMPARE(m_handler->requests().size(), 4);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect:cors/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect:cors/resources/redirect.css")));
+    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QVERIFY(!verifyLoad(QSL("redirect:file/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local-cors/resources/redirect.html")));
+}
+
+void tst_Origins::redirectSchemeLocal()
+{
+    QVERIFY(verifyLoad(QSL("redirect-local:local/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-local:local/resources/redirect.css')");
+    QTRY_COMPARE(m_handler->requests().size(), 4);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect-local:local/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("local:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect-local:local/resources/redirect.css")));
+    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("local:/resources/redirect.css")));
+}
+
+void tst_Origins::redirectSchemeSecure()
+{
+    QVERIFY(verifyLoad(QSL("redirect-secure:secure-cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-secure:secure-cors/resources/redirect.css')");
+    QTRY_COMPARE(m_handler->requests().size(), 4);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("secure-cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.css")));
+    QCOMPARE(m_handler->requests()[3], QUrl(QStringLiteral("secure-cors:/resources/redirect.css")));
 }
 
 void tst_Origins::redirectInterceptor()
@@ -1280,20 +1323,123 @@ void tst_Origins::redirectInterceptor()
     TestRequestInterceptor interceptor;
     m_profile.setUrlRequestInterceptor(&interceptor);
 
-    QVERIFY(verifyLoad(QSL("redirect:redirect-secure/resources/redirect.html")));
-    QTRY_COMPARE(interceptor.requests.size(), 7);
-    QTRY_COMPARE(m_handler->requests().size(), 3);
-    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("redirect-secure:/resources/redirect.html")));
-    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("redirect-secure:/resources/redirect.css")));
-    QCOMPARE(m_handler->requests()[2], QUrl(QStringLiteral("redirect-secure:/resources/Akronim-Regular.woff2")));
-
-    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.html")));
-    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("redirect-secure:/resources/redirect.html")));
-    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect:redirect-secure/resources/redirect.css")));
-    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("redirect-secure:/resources/redirect.css")));
-    QCOMPARE(interceptor.requests[4], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(interceptor.requests[5], QUrl(QStringLiteral("redirect:redirect-secure/resources/Akronim-Regular.woff2")));
-    QCOMPARE(interceptor.requests[6], QUrl(QStringLiteral("redirect-secure:/resources/Akronim-Regular.woff2")));
+    QVERIFY(verifyLoad(QSL("redirect:cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect:cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect:cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect:cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QVERIFY(!verifyLoad(QSL("redirect:file/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local/resources/redirect.html")));
+    QVERIFY(!verifyLoad(QSL("redirect:local-cors/resources/redirect.html")));
+}
+
+void tst_Origins::redirectInterceptorLocal()
+{
+    TestRequestInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("redirect-local:local/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-local:local/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("local:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("local:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect-local:local/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("local:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect-local:local/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("local:/resources/redirect.css")));
+}
+
+void tst_Origins::redirectInterceptorSecure()
+{
+    TestRequestInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("redirect-secure:secure-cors/resources/redirect.html")));
+    eval("addStylesheetLink('redirect-secure:secure-cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("secure-cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("secure-cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("secure-cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("redirect-secure:secure-cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("secure-cors:/resources/redirect.css")));
+}
+
+class TestRedirectInterceptor : public QWebEngineUrlRequestInterceptor
+{
+public:
+    TestRedirectInterceptor() = default;
+    void interceptRequest(QWebEngineUrlRequestInfo &info) override
+    {
+        qCDebug(lc) << this << "Type:" << info.resourceType() << info.requestMethod() << "Navigation:" << info.navigationType()
+                    << info.requestUrl() << "Initiator:" << info.initiator();
+
+        QUrl url = info.requestUrl();
+        requests << url;
+        if (url.path().startsWith("/redirect")) {
+            QString path = url.path();
+            int idx = path.indexOf(QChar('/'), 10);
+            if (idx > 0) {
+                url.setScheme(path.mid(10, idx - 10));
+                url.setPath(path.mid(idx, -1));
+                url.setHost({});
+                info.redirect(url);
+            }
+        }
+    }
+    QList<QUrl> requests;
+};
+
+void tst_Origins::redirectInterceptorFile()
+{
+    TestRedirectInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("file:///redirect/local-cors/resources/redirect.html")));
+    eval("addStylesheetLink('file:///redirect/local-cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("local-cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("local-cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("file:///redirect/local-cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("local-cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("file:///redirect/local-cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("local-cors:/resources/redirect.css")));
+}
+
+void tst_Origins::redirectInterceptorHttp()
+{
+    TestRedirectInterceptor interceptor;
+    m_profile.setUrlRequestInterceptor(&interceptor);
+
+    QVERIFY(verifyLoad(QSL("http://hallo/redirect/cors/resources/redirect.html")));
+    eval("addStylesheetLink('http://hallo/redirect/cors/resources/redirect.css')");
+
+    QTRY_COMPARE(interceptor.requests.size(), 4);
+    QTRY_COMPARE(m_handler->requests().size(), 2);
+    QCOMPARE(m_handler->requests()[0], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(m_handler->requests()[1], QUrl(QStringLiteral("cors:/resources/redirect.css")));
+
+    QCOMPARE(interceptor.requests[0], QUrl(QStringLiteral("http://hallo/redirect/cors/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[1], QUrl(QStringLiteral("cors:/resources/redirect.html")));
+    QCOMPARE(interceptor.requests[2], QUrl(QStringLiteral("http://hallo/redirect/cors/resources/redirect.css")));
+    QCOMPARE(interceptor.requests[3], QUrl(QStringLiteral("cors:/resources/redirect.css")));
 }
 
 void tst_Origins::localMediaBlock_data()
-- 
cgit v1.2.3


From c17adb8848e1d759fc61d46e9bcd621a55857ca8 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Mon, 14 Jun 2021 16:20:26 +0200
Subject: Support HTML5 <datalist> element

The datalist uses Chromium's autofill component to fetch and filter
predefined options in the list and autocomplete the field with the
selected option. Autofill component is added to build and bound to
WebEngine. All the unnecessary autofill features for datalist are
supposed to be disabled: payment/credit card support, password manager,
save profile data, store suggestions in database etc.

Custom popups for the dropdown are implemented for Widget and Quick.
Scrolling in dropdown is not implemented in this change.

Fixes: QTBUG-54433
Change-Id: I155d02d6dbc9d88fbca4bc5f55b76c19d0ba7a9d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 19c6b0a22f20a33c8c1fd4bdea29468fa8b4e10e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/CMakeLists.txt           |   1 +
 .../auto/quick/qmltests/data/TestWebEngineView.qml |  15 ++
 tests/auto/quick/qmltests/data/tst_datalist.qml    | 205 +++++++++++++++++++++
 .../quick/qmltests/data/tst_keyboardEvents.qml     |  14 --
 .../widgets/qwebengineview/tst_qwebengineview.cpp  | 152 +++++++++++++++
 5 files changed, 373 insertions(+), 14 deletions(-)
 create mode 100644 tests/auto/quick/qmltests/data/tst_datalist.qml

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt
index d878bdfcf..53c8ed231 100644
--- a/tests/auto/quick/qmltests/CMakeLists.txt
+++ b/tests/auto/quick/qmltests/CMakeLists.txt
@@ -19,6 +19,7 @@ set(testList
     tst_audioMuted.qml
     tst_contextMenu.qml
     tst_basicProfiles.qml
+    tst_datalist.qml
     tst_desktopBehaviorLoadHtml.qml
     tst_download.qml
     tst_favicon.qml
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index 68417c6c5..869754c90 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -113,6 +113,21 @@ WebEngineView {
         return textSelection;
     }
 
+    function getElementValue(element) {
+        var elementValue;
+        runJavaScript("document.getElementById('" + element + "').value", function(result) {
+            elementValue = result;
+        });
+        testCase.tryVerify(function() { return elementValue != undefined; });
+        return elementValue;
+    }
+
+    function compareElementValue(element, expected) {
+        testCase.tryVerify(function() { return expected == getElementValue(element); }, 5000,
+            "Value of element \"" + element + "\" is \"" + expected + "\"");
+    }
+
+
     TestResult { id: testResult }
 
     onLoadingChanged: function(load) {
diff --git a/tests/auto/quick/qmltests/data/tst_datalist.qml b/tests/auto/quick/qmltests/data/tst_datalist.qml
new file mode 100644
index 000000000..66cc49b0c
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_datalist.qml
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtTest
+import QtWebEngine
+
+TestWebEngineView {
+    id: webEngineView
+    width: 200
+    height: 400
+
+    property string html: "<html><body>" +
+                          "<input id='browserInput' list='browserDatalist'>" +
+                          "<datalist id='browserDatalist'>" +
+                          "  <option value='Internet Explorer'>" +
+                          "  <option value='Firefox'>" +
+                          "  <option value='Chrome'>" +
+                          "  <option value='Opera'>" +
+                          "  <option value='Safari'>" +
+                          "</datalist>" +
+                          "</body></html>"
+
+    function listView() {
+        if (webEngineView.parent.visibleChildren.length == 1) {
+            // No popup case.
+            return null;
+        }
+
+        let overlay = null;
+        for (let i = 0; i < webEngineView.parent.visibleChildren.length; ++i) {
+            let child = webEngineView.parent.visibleChildren[i];
+            if (child instanceof Overlay) {
+                overlay = child;
+                break;
+            }
+        }
+
+        if (!overlay)
+            return null;
+
+        let popupItem = null;
+        for (let i = 0; i < overlay.visibleChildren[0].visibleChildren.length; ++i) {
+            let child = overlay.visibleChildren[0].visibleChildren[i];
+            if (child.objectName == "QQuickPopupItem") {
+                popupItem = child;
+            }
+        }
+
+        if (!popupItem)
+            return null;
+
+        for (let i = 0; i < popupItem.visibleChildren.length; ++i) {
+            let child = popupItem.visibleChildren[i];
+            if (child instanceof ListView)
+                return child;
+        }
+
+        return null;
+    }
+
+    TestCase {
+        id: testCase
+        name: "WebEngineDatalist"
+        when: windowShown
+
+        function test_showAndHide() {
+            webEngineView.loadHtml(webEngineView.html);
+            verify(webEngineView.waitForLoadSucceeded());
+
+            var values = "";
+            webEngineView.runJavaScript(
+                        "(function() {" +
+                        "  var browserDatalist = document.getElementById('browserDatalist');" +
+                        "  var options = browserDatalist.options;" +
+                        "  var result = [];" +
+                        "  for (let i = 0; i < options.length; ++i) {" +
+                        "    result.push(options[i].value);" +
+                        "  }" +
+                        "  return result;" +
+                        "})();", function(result) { values = result; });
+            tryVerify(function() { return values.length != 0; });
+            compare(values, ["Internet Explorer", "Firefox", "Chrome", "Opera", "Safari"]);
+            compareElementValue("browserInput", "");
+
+            // Make sure there is no open popup yet.
+            verify(!listView());
+            // Click in the input field.
+            var browserInputCenter = getElementCenter("browserInput");
+            mouseClick(webEngineView, browserInputCenter.x, browserInputCenter.y, Qt.LeftButton);
+            // Wait for the popup.
+            tryVerify(function() { return listView() != null; });
+
+            // No suggestion is selected.
+            verify(!listView().currentItem);
+            compare(listView().count, 5);
+
+            // Accepting suggestion does nothing.
+            keyClick(Qt.Key_Enter);
+            tryVerify(function() { return listView() != null; });
+            verify(!listView().currentItem);
+
+            // Escape should close popup.
+            keyClick(Qt.Key_Escape);
+            tryVerify(function() { return listView() == null; });
+
+            // Key Down should open the popup and select the first suggestion.
+            keyClick(Qt.Key_Down);
+            tryVerify(function() { return listView() != null; });
+            compare(listView().currentIndex, 0);
+            verify(listView().currentItem);
+        }
+
+        function test_keyboardNavigationAndAccept() {
+            webEngineView.loadHtml(html);
+            verify(webEngineView.waitForLoadSucceeded());
+            setFocusToElement("browserInput");
+
+            // Make sure there is no open popup yet.
+            verify(!listView());
+
+            // Key Down should open the popup and select the first suggestion.
+            keyClick(Qt.Key_Down);
+            tryVerify(function() { return listView() != null; });
+            compare(listView().currentIndex, 0);
+
+            // Test keyboard navigation in list.
+            keyClick(Qt.Key_Up);
+            compare(listView().currentIndex, 4);
+            keyClick(Qt.Key_Up);
+            compare(listView().currentIndex, 3);
+            keyClick(Qt.Key_PageDown);
+            compare(listView().currentIndex, 4);
+            keyClick(Qt.Key_PageUp);
+            compare(listView().currentIndex, 0);
+            keyClick(Qt.Key_Down);
+            compare(listView().currentIndex, 1);
+            keyClick(Qt.Key_Down);
+            compare(listView().currentIndex, 2);
+
+            // Test accepting suggestion.
+            compare(listView().currentItem.text, "Chrome");
+            keyClick(Qt.Key_Enter);
+            compareElementValue("browserInput", "Chrome");
+            // Accept closes popup.
+            tryVerify(function() { return listView() == null; });
+
+            // Clear input field, should not trigger popup.
+            webEngineView.runJavaScript("document.getElementById('browserInput').value = ''");
+            compareElementValue("browserInput", "");
+            verify(listView() == null);
+        }
+
+        function test_filterSuggestion() {
+            webEngineView.loadHtml(html);
+            verify(webEngineView.waitForLoadSucceeded());
+            setFocusToElement("browserInput");
+
+            // Make sure there is no open popup yet.
+            verify(!listView());
+
+            // Filter suggestions.
+            keyClick(Qt.Key_F);
+            tryVerify(function() { return listView() != null; });
+            compare(listView().count, 2);
+            verify(!listView().currentItem);
+            compare(listView().itemAtIndex(0).text, "Firefox");
+            compare(listView().itemAtIndex(1).text, "Safari");
+            keyClick(Qt.Key_I);
+            tryVerify(function() { return listView().count == 1; });
+            verify(!listView().currentItem);
+            compare(listView().itemAtIndex(0).text, "Firefox");
+            keyClick(Qt.Key_L);
+            // Mismatch should close popup.
+            tryVerify(function() { return listView() == null; });
+            compareElementValue("browserInput", "fil");
+        }
+    }
+}
diff --git a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
index 7c594d921..170dde5e7 100644
--- a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
+++ b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
@@ -54,20 +54,6 @@ TestWebEngineView {
                 "Element \"" + element + "\" is " + (expected ? "" : "not") + " checked");
         }
 
-        function getElementValue(element) {
-            var elementValue;
-            runJavaScript("document.getElementById('" + element + "').value", function(result) {
-                elementValue = result;
-            });
-            tryVerify(function() { return elementValue != undefined; });
-            return elementValue;
-        }
-
-        function compareElementValue(element, expected) {
-            tryVerify(function() { return expected == getElementValue(element); }, 5000,
-                "Value of element \"" + element + "\" is \"" + expected + "\"");
-        }
-
         function test_keyboardEvents() {
             webEngineView.url = Qt.resolvedUrl("keyboardEvents.html");
             verify(webEngineView.waitForLoadSucceeded());
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 80da4664c..f54fdbbfc 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -37,6 +37,7 @@
 #include <QDropEvent>
 #include <QLabel>
 #include <QLineEdit>
+#include <QListView>
 #include <QHBoxLayout>
 #include <QMenu>
 #include <QMimeData>
@@ -44,6 +45,7 @@
 #include <QQuickWidget>
 #include <QtWebEngineCore/qwebenginehttprequest.h>
 #include <QScopeGuard>
+#include <QStringListModel>
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QStyle>
@@ -179,6 +181,7 @@ private Q_SLOTS:
     void inspectElement();
     void navigateOnDrop_data();
     void navigateOnDrop();
+    void datalist();
 };
 
 // This will be called before the first test function is executed.
@@ -3597,5 +3600,154 @@ void tst_QWebEngineView::navigateOnDrop()
     }
 }
 
+void tst_QWebEngineView::datalist()
+{
+    QString html("<html><body>"
+                 "<input id='browserInput' list='browserDatalist'>"
+                 "<datalist id='browserDatalist'>"
+                 "  <option value='Internet Explorer'>"
+                 "  <option value='Firefox'>"
+                 "  <option value='Chrome'>"
+                 "  <option value='Opera'>"
+                 "  <option value='Safari'>"
+                 "</datalist>"
+                 "</body></html>");
+
+    QWebEngineView view;
+    view.resize(200, 400);
+    view.show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    QSignalSpy loadSpy(&view, &QWebEngineView::loadFinished);
+    view.setHtml(html);
+    QTRY_COMPARE(loadSpy.count(), 1);
+
+    QString listValuesJS("(function() {"
+                         "  var browserDatalist = document.getElementById('browserDatalist');"
+                         "  var options = browserDatalist.options;"
+                         "  var result = [];"
+                         "  for (let i = 0; i < options.length; ++i) {"
+                         "    result.push(options[i].value);"
+                         "  }"
+                         "  return result;"
+                         "})();");
+    QStringList values = evaluateJavaScriptSync(view.page(), listValuesJS).toStringList();
+    QCOMPARE(values, QStringList({ "Internet Explorer", "Firefox", "Chrome", "Opera", "Safari" }));
+    QCOMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('browserInput').value;")
+                     .toString(),
+             QStringLiteral(""));
+
+    auto listView = [&view]() -> QListView * {
+        if (QApplication::topLevelWidgets().size() == 1) {
+            // No popup case.
+            return nullptr;
+        }
+
+        QWidget *autofillPopupWidget = nullptr;
+        for (QWidget *w : QApplication::topLevelWidgets()) {
+            if (w != &view) {
+                autofillPopupWidget = w;
+                break;
+            }
+        }
+
+        if (!autofillPopupWidget)
+            return nullptr;
+
+        for (QObject *o : autofillPopupWidget->children()) {
+            if (QListView *listView = qobject_cast<QListView *>(o))
+                return listView;
+        }
+
+        return nullptr;
+    };
+
+    // Make sure there is no open popup yet.
+    QVERIFY(!listView());
+    // Click in the input field.
+    QPoint browserInputCenter = elementCenter(view.page(), "browserInput");
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, browserInputCenter);
+    // Wait for the popup.
+    QTRY_VERIFY(listView());
+
+    // No suggestion is selected.
+    QCOMPARE(listView()->currentIndex(), QModelIndex());
+    QCOMPARE(listView()->model()->rowCount(), 5);
+
+    // Accepting suggestion does nothing.
+    QTest::keyClick(view.windowHandle(), Qt::Key_Enter);
+    QVERIFY(listView());
+    QCOMPARE(listView()->currentIndex(), QModelIndex());
+
+    // Escape should close popup.
+    QTest::keyClick(view.windowHandle(), Qt::Key_Escape);
+    QTRY_VERIFY(!listView());
+
+    // Key Down should open the popup and select the first suggestion.
+    QTest::keyClick(view.windowHandle(), Qt::Key_Down);
+    QTRY_VERIFY(listView());
+    QCOMPARE(listView()->currentIndex().row(), 0);
+
+    // Test keyboard navigation in list.
+    QTest::keyClick(view.windowHandle(), Qt::Key_Up);
+    QCOMPARE(listView()->currentIndex().row(), 4);
+    QTest::keyClick(view.windowHandle(), Qt::Key_Up);
+    QCOMPARE(listView()->currentIndex().row(), 3);
+    QTest::keyClick(view.windowHandle(), Qt::Key_PageDown);
+    QCOMPARE(listView()->currentIndex().row(), 4);
+    QTest::keyClick(view.windowHandle(), Qt::Key_PageUp);
+    QCOMPARE(listView()->currentIndex().row(), 0);
+    QTest::keyClick(view.windowHandle(), Qt::Key_Down);
+    QCOMPARE(listView()->currentIndex().row(), 1);
+    QTest::keyClick(view.windowHandle(), Qt::Key_Down);
+    QCOMPARE(listView()->currentIndex().row(), 2);
+
+    // Test accepting suggestion.
+    QCOMPARE(static_cast<QStringListModel *>(listView()->model())
+                     ->data(listView()->currentIndex())
+                     .toString(),
+             QStringLiteral("Chrome"));
+    QTest::keyClick(view.windowHandle(), Qt::Key_Enter);
+    QTRY_COMPARE(
+            evaluateJavaScriptSync(view.page(), "document.getElementById('browserInput').value")
+                    .toString(),
+            QStringLiteral("Chrome"));
+    // Accept closes popup.
+    QTRY_VERIFY(!listView());
+
+    // Clear input field, should not trigger popup.
+    evaluateJavaScriptSync(view.page(), "document.getElementById('browserInput').value = ''");
+    QVERIFY(!listView());
+
+    // Filter suggestions.
+    QTest::keyClick(view.windowHandle(), Qt::Key_F);
+    QTRY_VERIFY(listView());
+    QCOMPARE(listView()->model()->rowCount(), 2);
+    QCOMPARE(listView()->currentIndex(), QModelIndex());
+    QCOMPARE(static_cast<QStringListModel *>(listView()->model())
+                     ->data(listView()->model()->index(0, 0))
+                     .toString(),
+             QStringLiteral("Firefox"));
+    QCOMPARE(static_cast<QStringListModel *>(listView()->model())
+                     ->data(listView()->model()->index(1, 0))
+                     .toString(),
+             QStringLiteral("Safari"));
+    QTest::keyClick(view.windowHandle(), Qt::Key_I);
+    QTRY_COMPARE(listView()->model()->rowCount(), 1);
+    QCOMPARE(listView()->currentIndex(), QModelIndex());
+    QCOMPARE(static_cast<QStringListModel *>(listView()->model())
+                     ->data(listView()->model()->index(0, 0))
+                     .toString(),
+             QStringLiteral("Firefox"));
+    QTest::keyClick(view.windowHandle(), Qt::Key_L);
+    // Mismatch should close popup.
+    QTRY_VERIFY(!listView());
+    QTRY_COMPARE(
+            evaluateJavaScriptSync(view.page(), "document.getElementById('browserInput').value")
+                    .toString(),
+            QStringLiteral("fil"));
+}
+
 QTEST_MAIN(tst_QWebEngineView)
 #include "tst_qwebengineview.moc"
-- 
cgit v1.2.3


From 22f0d9d39b31fae19ec432ca4b62828b6896af0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucie=20G=C3=A9rard?= <lucie.gerard@qt.io>
Date: Thu, 9 Jun 2022 15:57:02 +0200
Subject: Use SPDX license identifiers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Task-number: QTBUG-67283
Change-Id: I869ffda1080e283f231eb0dc4477b260f2054d99
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 9b9d789fcb8f63a8998f1eefe44f2a1c8156c362)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../core/certificateerror/tst_certificateerror.cpp | 29 +-----------
 tests/auto/core/devtools/tst_devtools.cpp          | 29 +-----------
 tests/auto/core/origins/tst_origins.cpp            | 29 +-----------
 .../tst_qwebengineclientcertificatestore.cpp       | 29 +-----------
 .../tst_qwebenginecookiestore.cpp                  | 29 +-----------
 .../tst_qwebengineurlrequestinterceptor.cpp        | 29 +-----------
 tests/auto/httpserver/httpreqrep.cpp               | 29 +-----------
 tests/auto/httpserver/httpreqrep.h                 | 29 +-----------
 tests/auto/httpserver/httpserver.cpp               | 29 +-----------
 tests/auto/httpserver/httpserver.h                 | 29 +-----------
 tests/auto/httpserver/httpsserver.h                | 29 +-----------
 tests/auto/httpserver/proxy_server.cpp             | 29 +-----------
 tests/auto/httpserver/proxy_server.h               | 29 +-----------
 .../qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp    | 40 +----------------
 tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp   | 40 +----------------
 .../pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp  | 40 +----------------
 .../pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp    | 40 +----------------
 tests/auto/quick/dialogs/WebView.qml               | 29 +-----------
 tests/auto/quick/dialogs/testhandler.cpp           | 29 +-----------
 tests/auto/quick/dialogs/testhandler.h             | 29 +-----------
 tests/auto/quick/dialogs/tst_dialogs.cpp           | 29 +-----------
 .../quick/inspectorserver/tst_inspectorserver.cpp  | 29 +-----------
 tests/auto/quick/publicapi/tst_publicapi.cpp       | 29 +-----------
 .../auto/quick/qmltests/data/TestWebEngineView.qml | 29 +-----------
 tests/auto/quick/qmltests/data/titleupdate.js      | 29 +-----------
 tests/auto/quick/qmltests/data/tst_action.qml      | 29 +-----------
 .../quick/qmltests/data/tst_activeFocusOnPress.qml | 29 +-----------
 tests/auto/quick/qmltests/data/tst_audioMuted.qml  | 29 +-----------
 .../auto/quick/qmltests/data/tst_basicProfiles.qml | 29 +-----------
 .../quick/qmltests/data/tst_certificateError.qml   | 29 +-----------
 tests/auto/quick/qmltests/data/tst_contextMenu.qml | 29 +-----------
 .../qmltests/data/tst_desktopBehaviorLoadHtml.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_download.qml    | 29 +-----------
 tests/auto/quick/qmltests/data/tst_favicon.qml     | 29 +-----------
 .../quick/qmltests/data/tst_faviconDatabase.qml    | 29 +-----------
 tests/auto/quick/qmltests/data/tst_filePicker.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_findText.qml    | 29 +-----------
 .../quick/qmltests/data/tst_focusOnNavigation.qml  | 29 +-----------
 .../auto/quick/qmltests/data/tst_geopermission.qml | 29 +-----------
 .../auto/quick/qmltests/data/tst_getUserMedia.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_inputMethod.qml | 29 +-----------
 .../quick/qmltests/data/tst_javaScriptDialogs.qml  | 29 +-----------
 .../quick/qmltests/data/tst_keyboardEvents.qml     | 29 +-----------
 .../qmltests/data/tst_keyboardModifierMapping.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_linkHovered.qml | 29 +-----------
 tests/auto/quick/qmltests/data/tst_loadFail.qml    | 29 +-----------
 tests/auto/quick/qmltests/data/tst_loadHtml.qml    | 29 +-----------
 .../auto/quick/qmltests/data/tst_loadProgress.qml  | 29 +-----------
 .../quick/qmltests/data/tst_loadRecursionCrash.qml | 29 +-----------
 tests/auto/quick/qmltests/data/tst_loadUrl.qml     | 29 +-----------
 tests/auto/quick/qmltests/data/tst_mouseClick.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_mouseMove.qml   | 29 +-----------
 .../quick/qmltests/data/tst_navigationHistory.qml  | 29 +-----------
 .../qmltests/data/tst_navigationRequested.qml      | 29 +-----------
 .../quick/qmltests/data/tst_newViewRequest.qml     | 29 +-----------
 .../auto/quick/qmltests/data/tst_notification.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_properties.qml  | 29 +-----------
 .../auto/quick/qmltests/data/tst_runJavaScript.qml | 29 +-----------
 .../quick/qmltests/data/tst_scrollPosition.qml     | 29 +-----------
 tests/auto/quick/qmltests/data/tst_settings.qml    | 29 +-----------
 .../auto/quick/qmltests/data/tst_titleChanged.qml  | 29 +-----------
 .../data/tst_unhandledKeyEventPropagation.qml      | 29 +-----------
 .../qmltests/data/tst_userScriptCollection.qml     | 29 +-----------
 tests/auto/quick/qmltests/data/tst_userScripts.qml | 29 +-----------
 tests/auto/quick/qmltests/data/tst_viewSource.qml  | 29 +-----------
 tests/auto/quick/qmltests/data/tst_webchannel.qml  | 28 +-----------
 .../QtWebEngine/ControlsDelegates/AlertDialog.qml  | 29 +-----------
 .../ControlsDelegates/ConfirmDialog.qml            | 29 +-----------
 .../QtWebEngine/ControlsDelegates/FilePicker.qml   | 29 +-----------
 .../QtWebEngine/ControlsDelegates/Menu.qml         | 40 +----------------
 .../QtWebEngine/ControlsDelegates/MenuItem.qml     | 40 +----------------
 .../QtWebEngine/ControlsDelegates/PromptDialog.qml | 29 +-----------
 .../mock-delegates/TestParams/FilePickerParams.qml | 29 +-----------
 .../mock-delegates/TestParams/JSDialogParams.qml   | 29 +-----------
 .../mock-delegates/TestParams/MenuParams.qml       | 29 +-----------
 tests/auto/quick/qmltests/tst_qmltests.cpp         | 29 +-----------
 .../tst_qquickwebenginedefaultsurfaceformat.cpp    | 29 +-----------
 .../tst_qquickwebengineview.cpp                    | 29 +-----------
 .../tst_qquickwebengineviewgraphics.cpp            | 29 +-----------
 tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp   | 29 +-----------
 tests/auto/quick/uidelegates/tst_uidelegates.cpp   | 29 +-----------
 tests/auto/util/qt_webengine_quicktest.h           | 29 +-----------
 tests/auto/util/quickutil.h                        | 29 +-----------
 tests/auto/util/testwindow.h                       | 29 +-----------
 tests/auto/util/util.h                             | 29 +-----------
 tests/auto/util/widgetutil.h                       | 29 +-----------
 .../tst_defaultsurfaceformat.cpp                   | 29 +-----------
 tests/auto/widgets/favicon/tst_favicon.cpp         | 29 +-----------
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 29 +-----------
 tests/auto/widgets/offscreen/tst_offscreen.cpp     | 29 +-----------
 tests/auto/widgets/printing/tst_printing.cpp       | 29 +-----------
 tests/auto/widgets/proxy/tst_proxy.cpp             | 29 +-----------
 tests/auto/widgets/proxypac/proxyserver.cpp        | 29 +-----------
 tests/auto/widgets/proxypac/proxyserver.h          | 29 +-----------
 tests/auto/widgets/proxypac/tst_proxypac.cpp       | 29 +-----------
 .../tst_qwebenginedownloadrequest.cpp              | 29 +-----------
 .../qwebengineprofile/tst_qwebengineprofile.cpp    | 29 +-----------
 tests/auto/widgets/schemes/tst_schemes.cpp         | 29 +-----------
 tests/auto/widgets/shutdown/tst_shutdown.cpp       | 40 +----------------
 .../widgets/spellchecking/tst_spellchecking.cpp    | 29 +-----------
 tests/auto/widgets/touchinput/tst_touchinput.cpp   | 29 +-----------
 tests/manual/quick/pdf/bookmarks-list.qml          | 51 +---------------------
 tests/manual/quick/pdf/bookmarks.qml               | 51 +---------------------
 tests/manual/quick/pdf/gridview.qml                | 51 +---------------------
 tests/manual/quick/pdf/listview.qml                | 51 +---------------------
 tests/manual/quick/pdf/multipleDocuments.qml       | 51 +---------------------
 tests/manual/quick/pdf/pdfPageView.qml             | 51 +---------------------
 tests/manual/quick/pdf/pessimizedListView.qml      | 51 +---------------------
 tests/manual/quick/pdf/simplest.qml                | 51 +---------------------
 tests/manual/quick/pdf/underscoredLinks.qml        | 51 +---------------------
 tests/manual/quick/pdf/withdoc.qml                 | 51 +---------------------
 tests/manual/quick/touchbrowser/AddressBar.qml     | 29 +-----------
 tests/manual/quick/touchbrowser/MockTouchPoint.qml | 30 +------------
 tests/manual/quick/touchbrowser/main.cpp           | 29 +-----------
 tests/manual/quick/touchbrowser/main.qml           | 29 +-----------
 .../quick/touchbrowser/touchmockingapplication.cpp | 29 +-----------
 .../quick/touchbrowser/touchmockingapplication.h   | 29 +-----------
 tests/manual/quick/touchbrowser/utils.h            | 29 +-----------
 tests/manual/widgets/inputmethods/colorpicker.cpp  | 29 +-----------
 tests/manual/widgets/inputmethods/colorpicker.h    | 29 +-----------
 tests/manual/widgets/inputmethods/controlview.cpp  | 29 +-----------
 tests/manual/widgets/inputmethods/controlview.h    | 29 +-----------
 tests/manual/widgets/inputmethods/main.cpp         | 29 +-----------
 .../manual/widgets/inputmethods/referenceview.cpp  | 29 +-----------
 tests/manual/widgets/inputmethods/referenceview.h  | 29 +-----------
 tests/manual/widgets/inputmethods/testview.cpp     | 29 +-----------
 tests/manual/widgets/inputmethods/testview.h       | 29 +-----------
 tests/manual/widgets/inputmethods/webview.cpp      | 29 +-----------
 tests/manual/widgets/inputmethods/webview.h        | 29 +-----------
 tests/manual/widgets/webgl/main.cpp                | 29 +-----------
 tests/quicktestbrowser/ApplicationRoot.qml         | 29 +-----------
 tests/quicktestbrowser/BrowserDialog.qml           | 29 +-----------
 tests/quicktestbrowser/BrowserWindow.qml           | 29 +-----------
 tests/quicktestbrowser/ButtonWithMenu.qml          | 29 +-----------
 tests/quicktestbrowser/DownloadView.qml            | 29 +-----------
 tests/quicktestbrowser/FeaturePermissionBar.qml    | 29 +-----------
 tests/quicktestbrowser/FullScreenNotification.qml  | 29 +-----------
 tests/quicktestbrowser/ZoomController.qml          | 29 +-----------
 tests/quicktestbrowser/main.cpp                    | 29 +-----------
 tests/quicktestbrowser/utils.h                     | 29 +-----------
 140 files changed, 280 insertions(+), 4077 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 3c43d997f..4ae840e72 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #include <httpsserver.h>
 #include <util.h>
 
diff --git a/tests/auto/core/devtools/tst_devtools.cpp b/tests/auto/core/devtools/tst_devtools.cpp
index 064f95028..477b4cb20 100644
--- a/tests/auto/core/devtools/tst_devtools.cpp
+++ b/tests/auto/core/devtools/tst_devtools.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index dc6c57e2a..6596b3fa0 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 #include "httpserver.h"
diff --git a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
index f288a2c75..3ca28b901 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
+++ b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebengineclientcertificatestore.h>
diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index 8b4f17a65..e0fee6b08 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 79cbb5421..99cf3f244 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/httpserver/httpreqrep.cpp b/tests/auto/httpserver/httpreqrep.cpp
index 79f1d7a6f..34e148678 100644
--- a/tests/auto/httpserver/httpreqrep.cpp
+++ b/tests/auto/httpserver/httpreqrep.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #include "httpreqrep.h"
 
 HttpReqRep::HttpReqRep(QTcpSocket *socket, QObject *parent)
diff --git a/tests/auto/httpserver/httpreqrep.h b/tests/auto/httpserver/httpreqrep.h
index e1979e050..a8482536d 100644
--- a/tests/auto/httpserver/httpreqrep.h
+++ b/tests/auto/httpserver/httpreqrep.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #ifndef HTTPREQREP_H
 #define HTTPREQREP_H
 
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index 39666c222..6dd64ab88 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #include "httpserver.h"
 
 #include <QFile>
diff --git a/tests/auto/httpserver/httpserver.h b/tests/auto/httpserver/httpserver.h
index acc742775..270b6265f 100644
--- a/tests/auto/httpserver/httpserver.h
+++ b/tests/auto/httpserver/httpserver.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #ifndef HTTPSERVER_H
 #define HTTPSERVER_H
 
diff --git a/tests/auto/httpserver/httpsserver.h b/tests/auto/httpserver/httpsserver.h
index b257e69a7..d064c1416 100644
--- a/tests/auto/httpserver/httpsserver.h
+++ b/tests/auto/httpserver/httpsserver.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #ifndef HTTPSSERVER_H
 #define HTTPSSERVER_H
 
diff --git a/tests/auto/httpserver/proxy_server.cpp b/tests/auto/httpserver/proxy_server.cpp
index a321716e3..338415311 100644
--- a/tests/auto/httpserver/proxy_server.cpp
+++ b/tests/auto/httpserver/proxy_server.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "proxy_server.h"
 #include <QDataStream>
diff --git a/tests/auto/httpserver/proxy_server.h b/tests/auto/httpserver/proxy_server.h
index 57e69efe7..6be0c4e1a 100644
--- a/tests/auto/httpserver/proxy_server.h
+++ b/tests/auto/httpserver/proxy_server.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef PROXY_SERVER_H
 #define PROXY_SERVER_H
diff --git a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
index dddc7b936..e3b778396 100644
--- a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
+++ b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #include <QtTest/QtTest>
diff --git a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
index df437349e..a481ee57c 100644
--- a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
+++ b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #include <QtTest/QtTest>
diff --git a/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp b/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp
index 6389af0a7..a958123c7 100644
--- a/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp
+++ b/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Tobias König <tobias.koenig@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtPDF module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Tobias König <tobias.koenig@kdab.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include <QPdfDocument>
 #include <QPdfPageRenderer>
diff --git a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
index 3f115f03c..0bdb9296b 100644
--- a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
+++ b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #include <QtTest/QtTest>
diff --git a/tests/auto/quick/dialogs/WebView.qml b/tests/auto/quick/dialogs/WebView.qml
index 29b5d2ca0..45fafb42d 100644
--- a/tests/auto/quick/dialogs/WebView.qml
+++ b/tests/auto/quick/dialogs/WebView.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtWebEngine
diff --git a/tests/auto/quick/dialogs/testhandler.cpp b/tests/auto/quick/dialogs/testhandler.cpp
index 78a944cc6..f45852630 100644
--- a/tests/auto/quick/dialogs/testhandler.cpp
+++ b/tests/auto/quick/dialogs/testhandler.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testhandler.h"
 
diff --git a/tests/auto/quick/dialogs/testhandler.h b/tests/auto/quick/dialogs/testhandler.h
index 93ecfcdcb..c72e81841 100644
--- a/tests/auto/quick/dialogs/testhandler.h
+++ b/tests/auto/quick/dialogs/testhandler.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef TESTHANDLER_H
 #define TESTHANDLER_H
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp
index 8543c47da..086587cf4 100644
--- a/tests/auto/quick/dialogs/tst_dialogs.cpp
+++ b/tests/auto/quick/dialogs/tst_dialogs.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testhandler.h"
 #include <quickutil.h>
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 8aa88b34d..6c22c5d33 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 3b7da9759..75c7cd4f7 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QMetaEnum>
 #include <QMetaMethod>
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index 869754c90..7f8c271d0 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/titleupdate.js b/tests/auto/quick/qmltests/data/titleupdate.js
index c86139c13..720e83676 100644
--- a/tests/auto/quick/qmltests/data/titleupdate.js
+++ b/tests/auto/quick/qmltests/data/titleupdate.js
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 function updateTitle()
 {
diff --git a/tests/auto/quick/qmltests/data/tst_action.qml b/tests/auto/quick/qmltests/data/tst_action.qml
index 554f0929a..abe5f71b0 100644
--- a/tests/auto/quick/qmltests/data/tst_action.qml
+++ b/tests/auto/quick/qmltests/data/tst_action.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml b/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml
index d423bdd12..77968f6b6 100644
--- a/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml
+++ b/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_audioMuted.qml b/tests/auto/quick/qmltests/data/tst_audioMuted.qml
index c6a882f5a..85f813f0c 100644
--- a/tests/auto/quick/qmltests/data/tst_audioMuted.qml
+++ b/tests/auto/quick/qmltests/data/tst_audioMuted.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_basicProfiles.qml b/tests/auto/quick/qmltests/data/tst_basicProfiles.qml
index a84e4e997..97a25cdd8 100644
--- a/tests/auto/quick/qmltests/data/tst_basicProfiles.qml
+++ b/tests/auto/quick/qmltests/data/tst_basicProfiles.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml
index a9031896a..220ef9ac8 100644
--- a/tests/auto/quick/qmltests/data/tst_certificateError.qml
+++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_contextMenu.qml b/tests/auto/quick/qmltests/data/tst_contextMenu.qml
index d415996bd..58e27b8ba 100644
--- a/tests/auto/quick/qmltests/data/tst_contextMenu.qml
+++ b/tests/auto/quick/qmltests/data/tst_contextMenu.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml b/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml
index 8ab9925dd..6cb2841ec 100644
--- a/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml
+++ b/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_download.qml b/tests/auto/quick/qmltests/data/tst_download.qml
index 93c430a51..61a363c39 100644
--- a/tests/auto/quick/qmltests/data/tst_download.qml
+++ b/tests/auto/quick/qmltests/data/tst_download.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index ce4a2aa3c..15f116e5d 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_faviconDatabase.qml b/tests/auto/quick/qmltests/data/tst_faviconDatabase.qml
index 181c652d7..774708af0 100644
--- a/tests/auto/quick/qmltests/data/tst_faviconDatabase.qml
+++ b/tests/auto/quick/qmltests/data/tst_faviconDatabase.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index 475718c31..2404efd2d 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml
index 874f6184b..392ce5dca 100644
--- a/tests/auto/quick/qmltests/data/tst_findText.qml
+++ b/tests/auto/quick/qmltests/data/tst_findText.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml b/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml
index 7ed684f79..f070e4bc5 100644
--- a/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml
+++ b/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_geopermission.qml b/tests/auto/quick/qmltests/data/tst_geopermission.qml
index d16e94d8d..b99e50acc 100644
--- a/tests/auto/quick/qmltests/data/tst_geopermission.qml
+++ b/tests/auto/quick/qmltests/data/tst_geopermission.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml
index fe2d91011..3b33b7abe 100644
--- a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml
+++ b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_inputMethod.qml b/tests/auto/quick/qmltests/data/tst_inputMethod.qml
index 0b7135bbf..cf79e8a4d 100644
--- a/tests/auto/quick/qmltests/data/tst_inputMethod.qml
+++ b/tests/auto/quick/qmltests/data/tst_inputMethod.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
index 91b57c101..6e91b2e77 100644
--- a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
+++ b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
index 170dde5e7..0f69a7e81 100644
--- a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
+++ b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
index f37cdf4b6..d0bc75619 100644
--- a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
+++ b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_linkHovered.qml b/tests/auto/quick/qmltests/data/tst_linkHovered.qml
index a1343cbed..a11bd2450 100644
--- a/tests/auto/quick/qmltests/data/tst_linkHovered.qml
+++ b/tests/auto/quick/qmltests/data/tst_linkHovered.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml
index 73a3833e0..8e9224bbf 100644
--- a/tests/auto/quick/qmltests/data/tst_loadFail.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_loadHtml.qml b/tests/auto/quick/qmltests/data/tst_loadHtml.qml
index c4ed9ed3d..8f94cd4a2 100644
--- a/tests/auto/quick/qmltests/data/tst_loadHtml.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadHtml.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_loadProgress.qml b/tests/auto/quick/qmltests/data/tst_loadProgress.qml
index e4aa2d882..2c06a0207 100644
--- a/tests/auto/quick/qmltests/data/tst_loadProgress.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadProgress.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml b/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml
index 9d8de0a5a..c0eb5932b 100644
--- a/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
index c331fab6b..25a62c878 100644
--- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_mouseClick.qml b/tests/auto/quick/qmltests/data/tst_mouseClick.qml
index d75298a68..c0c6a6967 100644
--- a/tests/auto/quick/qmltests/data/tst_mouseClick.qml
+++ b/tests/auto/quick/qmltests/data/tst_mouseClick.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_mouseMove.qml b/tests/auto/quick/qmltests/data/tst_mouseMove.qml
index 6afab7aae..5ded24c57 100644
--- a/tests/auto/quick/qmltests/data/tst_mouseMove.qml
+++ b/tests/auto/quick/qmltests/data/tst_mouseMove.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml
index c7edb05ba..2ea76c387 100644
--- a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml
+++ b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml
index b3e247c44..31c0cf44e 100644
--- a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml
+++ b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
index 481f110bc..6d4bdbb41 100644
--- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
+++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_notification.qml b/tests/auto/quick/qmltests/data/tst_notification.qml
index 46a21ff4d..5d55e1201 100644
--- a/tests/auto/quick/qmltests/data/tst_notification.qml
+++ b/tests/auto/quick/qmltests/data/tst_notification.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_properties.qml b/tests/auto/quick/qmltests/data/tst_properties.qml
index 7ae218977..13d40ed11 100644
--- a/tests/auto/quick/qmltests/data/tst_properties.qml
+++ b/tests/auto/quick/qmltests/data/tst_properties.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml
index 949e50bb7..22e427ad4 100644
--- a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml
+++ b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
index 22fa92b85..e9c72ab7d 100644
--- a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
+++ b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtQuick.Window
diff --git a/tests/auto/quick/qmltests/data/tst_settings.qml b/tests/auto/quick/qmltests/data/tst_settings.qml
index 07ce77a04..11b2321e0 100644
--- a/tests/auto/quick/qmltests/data/tst_settings.qml
+++ b/tests/auto/quick/qmltests/data/tst_settings.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_titleChanged.qml b/tests/auto/quick/qmltests/data/tst_titleChanged.qml
index d73664b02..66a7c115f 100644
--- a/tests/auto/quick/qmltests/data/tst_titleChanged.qml
+++ b/tests/auto/quick/qmltests/data/tst_titleChanged.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml
index c84d5da2b..76363fa71 100644
--- a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml
+++ b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml b/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml
index 491590ffa..94c993771 100644
--- a/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScriptCollection.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index f885368ec..30704f47b 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml
index d6377cdad..44a88daab 100644
--- a/tests/auto/quick/qmltests/data/tst_viewSource.qml
+++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/data/tst_webchannel.qml b/tests/auto/quick/qmltests/data/tst_webchannel.qml
index 82db70288..780b55934 100644
--- a/tests/auto/quick/qmltests/data/tst_webchannel.qml
+++ b/tests/auto/quick/qmltests/data/tst_webchannel.qml
@@ -1,29 +1,5 @@
-/*********************************************************************
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtTest
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml
index 252678754..7d7efda0c 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 // Both dialogs are basically expected to behave in the same way from an API point of view
 ConfirmDialog { }
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml
index c4d3dd183..6125d0b98 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQml
 import QtTest
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml
index 0ba92f5ce..247088bcb 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import "../../TestParams"
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml
index aa03a9d30..cd7ed4821 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 import QtQml
 import "../../TestParams"
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml
index dcc1ca4b6..67dab1bba 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 import QtQml
 
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml
index 800481797..81a63d918 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQml
 import QtTest
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
index 48f94df60..4a1ffeb02 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 pragma Singleton
 import QtQuick
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml
index b24214a2e..1033b509e 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 pragma Singleton
 import QtQml
 
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/MenuParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/MenuParams.qml
index 952eb5ebe..d8a01764c 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/MenuParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/MenuParams.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 pragma Singleton
 import QtQml
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 36899f78a..5018c7e78 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <httpserver.h>
 
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
index 7b993d006..b4c95d671 100644
--- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
+++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testwindow.h"
 #include "quickutil.h"
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index c747e6b8f..5b5003846 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testwindow.h"
 #include "quickutil.h"
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index 1c6de9a3c..71c3a1cf2 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <quickutil.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
index 6f48c957f..cf5c187c3 100644
--- a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
+++ b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "qtwebenginequickglobal.h"
 #include <QQuickWebEngineProfile>
diff --git a/tests/auto/quick/uidelegates/tst_uidelegates.cpp b/tests/auto/quick/uidelegates/tst_uidelegates.cpp
index 4c2fa3b3c..fb8734f83 100644
--- a/tests/auto/quick/uidelegates/tst_uidelegates.cpp
+++ b/tests/auto/quick/uidelegates/tst_uidelegates.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testwindow.h"
 #include "quickutil.h"
diff --git a/tests/auto/util/qt_webengine_quicktest.h b/tests/auto/util/qt_webengine_quicktest.h
index 0428783bf..bd98693de 100644
--- a/tests/auto/util/qt_webengine_quicktest.h
+++ b/tests/auto/util/qt_webengine_quicktest.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef QT_WEBENGINE_QUICKTEST_H
 #define QT_WEBENGINE_QUICKTEST_H
diff --git a/tests/auto/util/quickutil.h b/tests/auto/util/quickutil.h
index 30e371a7e..f7e08f842 100644
--- a/tests/auto/util/quickutil.h
+++ b/tests/auto/util/quickutil.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef UTIL_H
 #define UTIL_H
diff --git a/tests/auto/util/testwindow.h b/tests/auto/util/testwindow.h
index 958381ff2..f9ffd381a 100644
--- a/tests/auto/util/testwindow.h
+++ b/tests/auto/util/testwindow.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef TESTWINDOW_H
 #define TESTWINDOW_H
diff --git a/tests/auto/util/util.h b/tests/auto/util/util.h
index 232d26d8f..e161903e2 100644
--- a/tests/auto/util/util.h
+++ b/tests/auto/util/util.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 // Functions and macros that really need to be in QTestLib
 
diff --git a/tests/auto/util/widgetutil.h b/tests/auto/util/widgetutil.h
index 5bb56a05e..67d09ee4f 100644
--- a/tests/auto/util/widgetutil.h
+++ b/tests/auto/util/widgetutil.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 // Functions and macros that really need to be in QTestLib
 
diff --git a/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp
index 7a52a372a..c53f6f5b3 100644
--- a/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp
+++ b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <qtest.h>
 #include <util.h>
diff --git a/tests/auto/widgets/favicon/tst_favicon.cpp b/tests/auto/widgets/favicon/tst_favicon.cpp
index 6b5ae3c02..dc1e9f096 100644
--- a/tests/auto/widgets/favicon/tst_favicon.cpp
+++ b/tests/auto/widgets/favicon/tst_favicon.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtTest/QtTest>
 #include <util.h>
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 1adbd0f50..28dd5f938 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/widgets/offscreen/tst_offscreen.cpp b/tests/auto/widgets/offscreen/tst_offscreen.cpp
index 81cbe95f3..9553a0394 100644
--- a/tests/auto/widgets/offscreen/tst_offscreen.cpp
+++ b/tests/auto/widgets/offscreen/tst_offscreen.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QTest>
 #include <QSignalSpy>
diff --git a/tests/auto/widgets/printing/tst_printing.cpp b/tests/auto/widgets/printing/tst_printing.cpp
index 81d5d9442..2e04bc03c 100644
--- a/tests/auto/widgets/printing/tst_printing.cpp
+++ b/tests/auto/widgets/printing/tst_printing.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QtWebEngineCore/qtwebenginecore-config.h>
diff --git a/tests/auto/widgets/proxy/tst_proxy.cpp b/tests/auto/widgets/proxy/tst_proxy.cpp
index c3e3c88a4..961d29303 100644
--- a/tests/auto/widgets/proxy/tst_proxy.cpp
+++ b/tests/auto/widgets/proxy/tst_proxy.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "proxy_server.h"
 #include <QTest>
diff --git a/tests/auto/widgets/proxypac/proxyserver.cpp b/tests/auto/widgets/proxypac/proxyserver.cpp
index 4d38c87c9..f7a859747 100644
--- a/tests/auto/widgets/proxypac/proxyserver.cpp
+++ b/tests/auto/widgets/proxypac/proxyserver.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "proxyserver.h"
 #include <QDataStream>
diff --git a/tests/auto/widgets/proxypac/proxyserver.h b/tests/auto/widgets/proxypac/proxyserver.h
index ea68286a2..c95856da9 100644
--- a/tests/auto/widgets/proxypac/proxyserver.h
+++ b/tests/auto/widgets/proxypac/proxyserver.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef PROXY_SERVER_H
 #define PROXY_SERVER_H
diff --git a/tests/auto/widgets/proxypac/tst_proxypac.cpp b/tests/auto/widgets/proxypac/tst_proxypac.cpp
index 223c995e0..8667af24a 100644
--- a/tests/auto/widgets/proxypac/tst_proxypac.cpp
+++ b/tests/auto/widgets/proxypac/tst_proxypac.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "proxy_server.h"
 #include <QTest>
diff --git a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
index 3cdf79250..4e9a9fecd 100644
--- a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
+++ b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index c09f3b51a..3b595f199 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 #include <QtCore/qbuffer.h>
diff --git a/tests/auto/widgets/schemes/tst_schemes.cpp b/tests/auto/widgets/schemes/tst_schemes.cpp
index a4a0e34ff..09aaecac4 100644
--- a/tests/auto/widgets/schemes/tst_schemes.cpp
+++ b/tests/auto/widgets/schemes/tst_schemes.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/widgets/shutdown/tst_shutdown.cpp b/tests/auto/widgets/shutdown/tst_shutdown.cpp
index 5c1e426d2..c2b31bb80 100644
--- a/tests/auto/widgets/shutdown/tst_shutdown.cpp
+++ b/tests/auto/widgets/shutdown/tst_shutdown.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #include <QtTest/QtTest>
diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
index 738010ac8..bb9cecae5 100644
--- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/widgets/touchinput/tst_touchinput.cpp b/tests/auto/widgets/touchinput/tst_touchinput.cpp
index e3ee9f933..562ccfcef 100644
--- a/tests/auto/widgets/touchinput/tst_touchinput.cpp
+++ b/tests/auto/widgets/touchinput/tst_touchinput.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 
diff --git a/tests/manual/quick/pdf/bookmarks-list.qml b/tests/manual/quick/pdf/bookmarks-list.qml
index fd6c38b54..2be0d6848 100644
--- a/tests/manual/quick/pdf/bookmarks-list.qml
+++ b/tests/manual/quick/pdf/bookmarks-list.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/pdf/bookmarks.qml b/tests/manual/quick/pdf/bookmarks.qml
index 230e3daf4..e12629b31 100644
--- a/tests/manual/quick/pdf/bookmarks.qml
+++ b/tests/manual/quick/pdf/bookmarks.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/pdf/gridview.qml b/tests/manual/quick/pdf/gridview.qml
index 4ad9e4676..773e72388 100644
--- a/tests/manual/quick/pdf/gridview.qml
+++ b/tests/manual/quick/pdf/gridview.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the manual tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Pdf
 
diff --git a/tests/manual/quick/pdf/listview.qml b/tests/manual/quick/pdf/listview.qml
index 3201908ac..d01be9e86 100644
--- a/tests/manual/quick/pdf/listview.qml
+++ b/tests/manual/quick/pdf/listview.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Pdf
 
diff --git a/tests/manual/quick/pdf/multipleDocuments.qml b/tests/manual/quick/pdf/multipleDocuments.qml
index 3e5fab9b4..9d08178f0 100644
--- a/tests/manual/quick/pdf/multipleDocuments.qml
+++ b/tests/manual/quick/pdf/multipleDocuments.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/pdf/pdfPageView.qml b/tests/manual/quick/pdf/pdfPageView.qml
index 7038e61d0..475e1d608 100644
--- a/tests/manual/quick/pdf/pdfPageView.qml
+++ b/tests/manual/quick/pdf/pdfPageView.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/pdf/pessimizedListView.qml b/tests/manual/quick/pdf/pessimizedListView.qml
index d8e0fadd0..1b514668e 100644
--- a/tests/manual/quick/pdf/pessimizedListView.qml
+++ b/tests/manual/quick/pdf/pessimizedListView.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/pdf/simplest.qml b/tests/manual/quick/pdf/simplest.qml
index 4178a87af..3f39bb213 100644
--- a/tests/manual/quick/pdf/simplest.qml
+++ b/tests/manual/quick/pdf/simplest.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 
 Image {
diff --git a/tests/manual/quick/pdf/underscoredLinks.qml b/tests/manual/quick/pdf/underscoredLinks.qml
index 984dc0b0f..514008ca2 100644
--- a/tests/manual/quick/pdf/underscoredLinks.qml
+++ b/tests/manual/quick/pdf/underscoredLinks.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/pdf/withdoc.qml b/tests/manual/quick/pdf/withdoc.qml
index 9766adeaa..d4bf12e29 100644
--- a/tests/manual/quick/pdf/withdoc.qml
+++ b/tests/manual/quick/pdf/withdoc.qml
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
diff --git a/tests/manual/quick/touchbrowser/AddressBar.qml b/tests/manual/quick/touchbrowser/AddressBar.qml
index 77d887f3f..6ccea3441 100644
--- a/tests/manual/quick/touchbrowser/AddressBar.qml
+++ b/tests/manual/quick/touchbrowser/AddressBar.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtQuick.Controls
diff --git a/tests/manual/quick/touchbrowser/MockTouchPoint.qml b/tests/manual/quick/touchbrowser/MockTouchPoint.qml
index bc24b002e..bdce0555c 100644
--- a/tests/manual/quick/touchbrowser/MockTouchPoint.qml
+++ b/tests/manual/quick/touchbrowser/MockTouchPoint.qml
@@ -1,31 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt WebBrowser application.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick
 
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index ffbe81179..b63f3b31c 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #if defined(DESKTOP_BUILD)
 #include "touchmockingapplication.h"
diff --git a/tests/manual/quick/touchbrowser/main.qml b/tests/manual/quick/touchbrowser/main.qml
index 1b864c057..83ede7d75 100644
--- a/tests/manual/quick/touchbrowser/main.qml
+++ b/tests/manual/quick/touchbrowser/main.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtQuick.Layouts
diff --git a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
index 7a05567cb..4fad86d33 100644
--- a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
+++ b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "touchmockingapplication.h"
 
diff --git a/tests/manual/quick/touchbrowser/touchmockingapplication.h b/tests/manual/quick/touchbrowser/touchmockingapplication.h
index 205cab694..3264d5a0c 100644
--- a/tests/manual/quick/touchbrowser/touchmockingapplication.h
+++ b/tests/manual/quick/touchbrowser/touchmockingapplication.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef TOUCHMOCKINGAPPLICATION_H
 #define TOUCHMOCKINGAPPLICATION_H
diff --git a/tests/manual/quick/touchbrowser/utils.h b/tests/manual/quick/touchbrowser/utils.h
index b7aeefce0..605ebf23d 100644
--- a/tests/manual/quick/touchbrowser/utils.h
+++ b/tests/manual/quick/touchbrowser/utils.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef UTILS_H
 #define UTILS_H
diff --git a/tests/manual/widgets/inputmethods/colorpicker.cpp b/tests/manual/widgets/inputmethods/colorpicker.cpp
index ee2e2e43f..cc0840bcd 100644
--- a/tests/manual/widgets/inputmethods/colorpicker.cpp
+++ b/tests/manual/widgets/inputmethods/colorpicker.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "colorpicker.h"
 
diff --git a/tests/manual/widgets/inputmethods/colorpicker.h b/tests/manual/widgets/inputmethods/colorpicker.h
index f5448ad2d..171c0186b 100644
--- a/tests/manual/widgets/inputmethods/colorpicker.h
+++ b/tests/manual/widgets/inputmethods/colorpicker.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef COLORPICKER_H
 #define COLORPICKER_H
diff --git a/tests/manual/widgets/inputmethods/controlview.cpp b/tests/manual/widgets/inputmethods/controlview.cpp
index 358199a7f..86bf8cca9 100644
--- a/tests/manual/widgets/inputmethods/controlview.cpp
+++ b/tests/manual/widgets/inputmethods/controlview.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "controlview.h"
 
diff --git a/tests/manual/widgets/inputmethods/controlview.h b/tests/manual/widgets/inputmethods/controlview.h
index b0593012b..f6b3e7fe6 100644
--- a/tests/manual/widgets/inputmethods/controlview.h
+++ b/tests/manual/widgets/inputmethods/controlview.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef CONTROLVIEW_H
 #define CONTROLVIEW_H
diff --git a/tests/manual/widgets/inputmethods/main.cpp b/tests/manual/widgets/inputmethods/main.cpp
index 2388a95d7..2378e95ae 100644
--- a/tests/manual/widgets/inputmethods/main.cpp
+++ b/tests/manual/widgets/inputmethods/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QApplication>
 #include <QFormLayout>
diff --git a/tests/manual/widgets/inputmethods/referenceview.cpp b/tests/manual/widgets/inputmethods/referenceview.cpp
index 906a3001e..27e784fbc 100644
--- a/tests/manual/widgets/inputmethods/referenceview.cpp
+++ b/tests/manual/widgets/inputmethods/referenceview.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "referenceview.h"
 
diff --git a/tests/manual/widgets/inputmethods/referenceview.h b/tests/manual/widgets/inputmethods/referenceview.h
index 4025d4886..d943a93d0 100644
--- a/tests/manual/widgets/inputmethods/referenceview.h
+++ b/tests/manual/widgets/inputmethods/referenceview.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef REFERENCEVIEW_H
 #define REFERENCEVIEW_H
diff --git a/tests/manual/widgets/inputmethods/testview.cpp b/tests/manual/widgets/inputmethods/testview.cpp
index 77133d31d..d57b22cc5 100644
--- a/tests/manual/widgets/inputmethods/testview.cpp
+++ b/tests/manual/widgets/inputmethods/testview.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "testview.h"
 
diff --git a/tests/manual/widgets/inputmethods/testview.h b/tests/manual/widgets/inputmethods/testview.h
index 245d98c3e..feb512cde 100644
--- a/tests/manual/widgets/inputmethods/testview.h
+++ b/tests/manual/widgets/inputmethods/testview.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef TESTVIEW_H
 #define TESTVIEW_H
diff --git a/tests/manual/widgets/inputmethods/webview.cpp b/tests/manual/widgets/inputmethods/webview.cpp
index 62e210ecf..915d73a7f 100644
--- a/tests/manual/widgets/inputmethods/webview.cpp
+++ b/tests/manual/widgets/inputmethods/webview.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "webview.h"
 #include <QWebEngineSettings>
diff --git a/tests/manual/widgets/inputmethods/webview.h b/tests/manual/widgets/inputmethods/webview.h
index be57fbf29..a46dcb2f6 100644
--- a/tests/manual/widgets/inputmethods/webview.h
+++ b/tests/manual/widgets/inputmethods/webview.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #ifndef WEBVIEW_H
 #define WEBVIEW_H
 
diff --git a/tests/manual/widgets/webgl/main.cpp b/tests/manual/widgets/webgl/main.cpp
index c18a15bac..7037c34db 100644
--- a/tests/manual/widgets/webgl/main.cpp
+++ b/tests/manual/widgets/webgl/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <QtCore/QDebug>
 #include <QtCore/QLoggingCategory>
diff --git a/tests/quicktestbrowser/ApplicationRoot.qml b/tests/quicktestbrowser/ApplicationRoot.qml
index a2e83e1e6..74e913ba5 100644
--- a/tests/quicktestbrowser/ApplicationRoot.qml
+++ b/tests/quicktestbrowser/ApplicationRoot.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.1
 import QtWebEngine 1.1
diff --git a/tests/quicktestbrowser/BrowserDialog.qml b/tests/quicktestbrowser/BrowserDialog.qml
index 9f286125e..a896223dc 100644
--- a/tests/quicktestbrowser/BrowserDialog.qml
+++ b/tests/quicktestbrowser/BrowserDialog.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml
index 128674f02..699e877a9 100644
--- a/tests/quicktestbrowser/BrowserWindow.qml
+++ b/tests/quicktestbrowser/BrowserWindow.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.1
 import QtWebEngine 1.2
diff --git a/tests/quicktestbrowser/ButtonWithMenu.qml b/tests/quicktestbrowser/ButtonWithMenu.qml
index b8d4f743c..56a4d3533 100644
--- a/tests/quicktestbrowser/ButtonWithMenu.qml
+++ b/tests/quicktestbrowser/ButtonWithMenu.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.3
 import QtQuick.Controls 1.2
diff --git a/tests/quicktestbrowser/DownloadView.qml b/tests/quicktestbrowser/DownloadView.qml
index eb945eccc..f4834edad 100644
--- a/tests/quicktestbrowser/DownloadView.qml
+++ b/tests/quicktestbrowser/DownloadView.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
diff --git a/tests/quicktestbrowser/FeaturePermissionBar.qml b/tests/quicktestbrowser/FeaturePermissionBar.qml
index 500d13206..ca75875f5 100644
--- a/tests/quicktestbrowser/FeaturePermissionBar.qml
+++ b/tests/quicktestbrowser/FeaturePermissionBar.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
diff --git a/tests/quicktestbrowser/FullScreenNotification.qml b/tests/quicktestbrowser/FullScreenNotification.qml
index 90f27cca6..e48d6c646 100644
--- a/tests/quicktestbrowser/FullScreenNotification.qml
+++ b/tests/quicktestbrowser/FullScreenNotification.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.5
 
diff --git a/tests/quicktestbrowser/ZoomController.qml b/tests/quicktestbrowser/ZoomController.qml
index 122ae8815..2122c4365 100644
--- a/tests/quicktestbrowser/ZoomController.qml
+++ b/tests/quicktestbrowser/ZoomController.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick 2.3
 import QtQuick.Controls 1.2
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index cb21518c9..2d4fa544e 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "utils.h"
 
diff --git a/tests/quicktestbrowser/utils.h b/tests/quicktestbrowser/utils.h
index d4f3dba0e..8521e9bf5 100644
--- a/tests/quicktestbrowser/utils.h
+++ b/tests/quicktestbrowser/utils.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #ifndef UTILS_H
 #define UTILS_H
 
-- 
cgit v1.2.3


From a9694ce03541ddd3341ae9b87c208c8862a84399 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Mon, 20 Jun 2022 16:24:53 +0200
Subject: Various clean-ups

Change-Id: I53e04a247a25149d9f29135484c0528c706de7d8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 8c113ad54b39d26c011a8a127b8dac6c401a9ef3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/util/util.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/util/util.h b/tests/auto/util/util.h
index e161903e2..455dff20c 100644
--- a/tests/auto/util/util.h
+++ b/tests/auto/util/util.h
@@ -8,6 +8,8 @@
 #endif
 
 #include <QEventLoop>
+#include <QPoint>
+#include <QRect>
 #include <QSignalSpy>
 #include <QTimer>
 #include <qwebenginefindtextresult.h>
-- 
cgit v1.2.3


From 0395f01f31c56758d73d756d1621f087ce5274c0 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 7 Jun 2022 11:01:36 +0200
Subject: Skip uidelegates test on macos

We have two bugs here, one failing most tests, and one crashing.

Skip the entire test on macos until fixed.

Task-number: QTBUG-101744
Task-number: QTBUG-103354
Change-Id: Ib56921b8d075ab5874f68fe8c0815c6c0155b5de
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit b257ca2411745deaf8525f88f9bb0707f948763a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt
index d44d67d38..48a83e7de 100644
--- a/tests/auto/quick/CMakeLists.txt
+++ b/tests/auto/quick/CMakeLists.txt
@@ -2,7 +2,10 @@ add_subdirectory(dialogs)
 add_subdirectory(publicapi)
 add_subdirectory(qquickwebenginedefaultsurfaceformat)
 add_subdirectory(qtbug-70248)
-add_subdirectory(uidelegates)
+# Re-enable if QTBUG-101744 and QTBUG-103354 have been fixed. 
+if(NOT MACOS)
+    add_subdirectory(uidelegates)
+endif()
 add_subdirectory(inspectorserver)
 add_subdirectory(qmltests)
 add_subdirectory(qquickwebengineview)
-- 
cgit v1.2.3


From d665cf4bf1fb925125bf1ce24ac87b6564bf5fb6 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 7 Jun 2022 11:01:36 +0200
Subject: Skip uidelegates test on macos

We have two bugs here, one failing most tests, and one crashing.

Skip the entire test on macos until fixed.

Task-number: QTBUG-101744
Task-number: QTBUG-103354
Change-Id: Ib56921b8d075ab5874f68fe8c0815c6c0155b5de
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit b257ca2411745deaf8525f88f9bb0707f948763a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt
index d44d67d38..48a83e7de 100644
--- a/tests/auto/quick/CMakeLists.txt
+++ b/tests/auto/quick/CMakeLists.txt
@@ -2,7 +2,10 @@ add_subdirectory(dialogs)
 add_subdirectory(publicapi)
 add_subdirectory(qquickwebenginedefaultsurfaceformat)
 add_subdirectory(qtbug-70248)
-add_subdirectory(uidelegates)
+# Re-enable if QTBUG-101744 and QTBUG-103354 have been fixed. 
+if(NOT MACOS)
+    add_subdirectory(uidelegates)
+endif()
 add_subdirectory(inspectorserver)
 add_subdirectory(qmltests)
 add_subdirectory(qquickwebengineview)
-- 
cgit v1.2.3


From 657afd5598c9d88992b924480c6dbe6148f385be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucie=20G=C3=A9rard?= <lucie.gerard@qt.io>
Date: Wed, 29 Jun 2022 14:22:28 +0200
Subject: Use SPDX license identifiers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ammend 9b9d789fcb8f63a8998f1eefe44f2a1c8156c362 :
some files were still missing SPDX headers

Task-number: QTBUG-67283
Task-number: QTBUG-104589
Change-Id: Ia4d2aae636bbdb1a99c422e3b8d3f097c3af34d6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit e74ccbf41d2cce734175579a58d36eb7f223319c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/data/tst_datalist.qml | 29 ++-----------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_datalist.qml b/tests/auto/quick/qmltests/data/tst_datalist.qml
index 66cc49b0c..f739639b2 100644
--- a/tests/auto/quick/qmltests/data/tst_datalist.qml
+++ b/tests/auto/quick/qmltests/data/tst_datalist.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 import QtQuick
 import QtQuick.Controls
-- 
cgit v1.2.3


From e83ed04bd3ee4d9aedbda1ac71a3ebc019d54459 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 22 Jun 2022 17:16:54 +0200
Subject: Fix single process crash when proxy pac is used

Using proxy v8 resolver ends up in race condition
when render thread tries to evaluate extension handle
and v8 proxy resolver evaluates proxy pac script.

Disable v8 proxy resolver for single process mode.
Issue tracked upstream http://crbug.com/474654

Modify the unit test to catch the crash case, the test
loads now network resource but it does not matter
as we do not check for failure or success.

Fixes: QTBUG-104436
Change-Id: Id3221d1b8b3896f0ced3d0cd7cb9d9eceeb929cc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1b6633d1ce86eaf43b750a03a785793512e487ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/proxypac/CMakeLists.txt   | 22 ++++++++++++++++++----
 tests/auto/widgets/proxypac/proxy.pac        |  2 +-
 tests/auto/widgets/proxypac/tst_proxypac.cpp | 14 +++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/proxypac/CMakeLists.txt b/tests/auto/widgets/proxypac/CMakeLists.txt
index 1dd2c8bec..d3ddfd0c5 100644
--- a/tests/auto/widgets/proxypac/CMakeLists.txt
+++ b/tests/auto/widgets/proxypac/CMakeLists.txt
@@ -21,6 +21,22 @@ set_tests_properties(tst_proxypac_file PROPERTIES
     ENVIRONMENT QTWEBENGINE_CHROMIUM_FLAGS=${fileEnvArg}
 )
 
+if(NOT (LINUX AND CMAKE_CROSSCOMPILING))
+    set(fileEnvArg "--single-process ${fileEnvArg}")
+
+    qt_internal_add_test(tst_proxypac_single_process
+        SOURCES
+            tst_proxypac.cpp
+        LIBRARIES
+            Qt::WebEngineCore
+            Test::HttpServer
+    )
+
+    set_tests_properties(tst_proxypac_single_process PROPERTIES
+        ENVIRONMENT QTWEBENGINE_CHROMIUM_FLAGS=${fileEnvArg}
+    )
+endif()
+
 qt_internal_add_test(tst_proxypac_qrc
     SOURCES
         tst_proxypac.cpp
@@ -40,8 +56,6 @@ set_tests_properties(tst_proxypac_qrc PROPERTIES
 )
 
 qt_internal_add_resource(tst_proxypac_qrc "proxypac"
-    PREFIX
-        "/"
-    FILES
-        "proxy.pac"
+    PREFIX "/"
+    FILES "proxy.pac"
 )
diff --git a/tests/auto/widgets/proxypac/proxy.pac b/tests/auto/widgets/proxypac/proxy.pac
index 1d29847b9..966c37ba5 100644
--- a/tests/auto/widgets/proxypac/proxy.pac
+++ b/tests/auto/widgets/proxypac/proxy.pac
@@ -2,6 +2,6 @@ function FindProxyForURL(url, host)
 {
    if (shExpMatch(host, "*.proxy1.com")) return "PROXY localhost:5551";
    if (shExpMatch(host, "*.proxy2.com")) return "PROXY localhost:5552";
-   return "PROXY proxy.url:8080";
+   return "DIRECT";
 }
 
diff --git a/tests/auto/widgets/proxypac/tst_proxypac.cpp b/tests/auto/widgets/proxypac/tst_proxypac.cpp
index 223c995e0..0b218aef9 100644
--- a/tests/auto/widgets/proxypac/tst_proxypac.cpp
+++ b/tests/auto/widgets/proxypac/tst_proxypac.cpp
@@ -33,7 +33,6 @@
 #include <QWebEnginePage>
 #include <QNetworkProxy>
 
-
 class tst_ProxyPac : public QObject {
     Q_OBJECT
 public:
@@ -64,11 +63,20 @@ void tst_ProxyPac::proxypac()
 
     QWebEngineProfile profile;
     QWebEnginePage page(&profile);
+
+    const bool v8_proxy_resolver_enabled = !fromEnv.contains("--single-process");
     page.load(QUrl("http://test.proxy1.com"));
-    QTRY_COMPARE(proxySpy1.count() >= 1, true);
+    QTRY_COMPARE(proxySpy1.count() >= 1, v8_proxy_resolver_enabled);
     QVERIFY(proxySpy2.count() == 0);
     page.load(QUrl("http://test.proxy2.com"));
-    QTRY_COMPARE(proxySpy2.count() >= 1 , true);
+    QTRY_COMPARE(proxySpy2.count() >= 1, v8_proxy_resolver_enabled);
+
+    // check for crash
+    QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
+    page.load(QUrl("https://contribute.qt-project.org"));
+
+    QTRY_VERIFY_WITH_TIMEOUT(!spyFinished.isEmpty(), 100000);
+
 }
 
 #include "tst_proxypac.moc"
-- 
cgit v1.2.3


From 0b8f3edba663ea75c996bdc7e4b4c0cfed3663ed Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 16 May 2022 18:34:48 +0200
Subject: Adaptations for Chromium 100

Change-Id: I217c87657f544a2e868de7291353ff1143e20902
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit fae023b184f6c044e85f4ca6052c306d519e2e85)
---
 tests/auto/quick/qmltests/data/tst_newViewRequest.qml    |  2 +-
 .../widgets/qwebenginehistory/tst_qwebenginehistory.cpp  |  4 ++--
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
index 6d4bdbb41..a47862565 100644
--- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
+++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
@@ -98,7 +98,7 @@ TestWebEngineView {
 
             if (viewType === "dialog") {
                 tryVerify(dialog.webEngineView.loadSucceeded)
-                compare(dialog.webEngineView.url, Qt.url("about:blank"));
+                compare(dialog.webEngineView.url, "");
                 dialog.destroy();
             }
             // https://chromium-review.googlesource.com/c/chromium/src/+/1300395
diff --git a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp
index 448b2232b..f67c2e03d 100644
--- a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp
+++ b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp
@@ -487,9 +487,9 @@ void tst_QWebEngineHistory::clear()
 
     QWebEnginePage page2(this);
     QWebEngineHistory* hist2 = page2.history();
-    QVERIFY(hist2->count() == 1);
+    QVERIFY(hist2->count() == 0);
     hist2->clear();
-    QVERIFY(hist2->count() == 1); // Do not change anything.
+    QVERIFY(hist2->count() == 0); // Do not change anything.
 }
 
 void tst_QWebEngineHistory::historyItemFromDeletedPage()
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 262e1ea8d..1fdf69307 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -154,7 +154,7 @@ private Q_SLOTS:
 #endif
     void openWindowDefaultSize();
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     void macCopyUnicodeToClipboard();
 #endif
 
@@ -1456,7 +1456,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     QCOMPARE(popupPos + QPoint(offset, 0), popup->position());
 }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 void tst_QWebEnginePage::macCopyUnicodeToClipboard()
 {
     QString unicodeText = QString::fromUtf8("αβγδεζηθικλμπ");
@@ -2047,14 +2047,14 @@ void tst_QWebEnginePage::symmetricUrl()
 
     QVERIFY(view.url().isEmpty());
 
-    QCOMPARE(view.history()->count(), 1);
+    QCOMPARE(view.history()->count(), 0);
 
     QUrl dataUrl("data:text/html,<h1>Test");
 
     view.setUrl(dataUrl);
     view.show();
     QCOMPARE(view.url(), dataUrl);
-    QCOMPARE(view.history()->count(), 1);
+    QCOMPARE(view.history()->count(), 0);
 
     // loading is _not_ immediate, so the text isn't set just yet.
     QVERIFY(toPlainTextSync(view.page()).isEmpty());
@@ -2367,7 +2367,7 @@ void tst_QWebEnginePage::setHtmlWithBaseURL()
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].height").toInt(), 128);
 
     // no history item has to be added.
-    QCOMPARE(m_view->page()->history()->count(), 1);
+    QCOMPARE(m_view->page()->history()->count(), 0);
 }
 
 class MyPage : public QWebEnginePage
@@ -2797,7 +2797,7 @@ void tst_QWebEnginePage::setUrlHistory()
     int expectedLoadFinishedCount = 0;
     QSignalSpy spy(m_page, SIGNAL(loadFinished(bool)));
 
-    QCOMPARE(m_page->history()->count(), 1);
+    QCOMPARE(m_page->history()->count(), 0);
 
     m_page->setUrl(QUrl());
     expectedLoadFinishedCount++;
@@ -2871,7 +2871,7 @@ void tst_QWebEnginePage::setUrlUsingStateObject()
     QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
     int expectedUrlChangeCount = 0;
 
-    QCOMPARE(m_page->history()->count(), 1);
+    QCOMPARE(m_page->history()->count(), 0);
 
     url = QUrl("qrc:/resources/test1.html");
     m_page->setUrl(url);
@@ -3693,7 +3693,7 @@ void tst_QWebEnginePage::openLinkInNewPage()
             QCOMPARE(page1.history()->count(), 1);
         else
             QCOMPARE(page1.history()->count(), 2);
-        QCOMPARE(page2.history()->count(), 1);
+        QCOMPARE(page2.history()->count(), 0);
         break;
     case Effect::LoadInOther:
         QTRY_COMPARE(page2.spy.count(), 1);
-- 
cgit v1.2.3


From d15569d3a1bb3d391ddeeede9aac62a203c9604a Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 19 May 2022 12:45:29 +0200
Subject: Adaptations for Chromium 102

Change-Id: I7ef0ad616f2ea0fae482253335e95998aa2d360e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 00e2201264e3839570fbf64817eeca931a630b01)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index f54fdbbfc..fd6c56a3e 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -3148,45 +3148,50 @@ void tst_QWebEngineView::webUIURLs_data()
     QTest::addColumn<bool>("supported");
     QTest::newRow("about") << QUrl("chrome://about") << false;
     QTest::newRow("accessibility") << QUrl("chrome://accessibility") << true;
+    QTest::newRow("app-service-internals") << QUrl("chrome://app-service-internals") << false;
+    QTest::newRow("app-settings") << QUrl("chrome://app-settings") << false;
     QTest::newRow("apps") << QUrl("chrome://apps") << false;
+    QTest::newRow("attribution-internals") << QUrl("chrome://attribution-internals") << true;
     QTest::newRow("autofill-internals") << QUrl("chrome://autofill-internals") << false;
     QTest::newRow("blob-internals") << QUrl("chrome://blob-internals") << true;
     QTest::newRow("bluetooth-internals") << QUrl("chrome://bluetooth-internals") << false;
     QTest::newRow("bookmarks") << QUrl("chrome://bookmarks") << false;
     QTest::newRow("chrome-urls") << QUrl("chrome://chrome-urls") << false;
     QTest::newRow("components") << QUrl("chrome://components") << false;
-    QTest::newRow("conversion-internals") << QUrl("chrome://conversion-internals") << true;
+    QTest::newRow("connectors-internals") << QUrl("chrome://connectors-internals") << false;
     QTest::newRow("crashes") << QUrl("chrome://crashes") << false;
     QTest::newRow("credits") << QUrl("chrome://credits") << false;
     QTest::newRow("device-log") << QUrl("chrome://device-log") << true;
-    QTest::newRow("devices") << QUrl("chrome://devices") << false;
     QTest::newRow("dino") << QUrl("chrome://dino") << false; // It works but this is an error page
     QTest::newRow("discards") << QUrl("chrome://discards") << false;
     QTest::newRow("download-internals") << QUrl("chrome://download-internals") << false;
     QTest::newRow("downloads") << QUrl("chrome://downloads") << false;
     QTest::newRow("extensions") << QUrl("chrome://extensions") << false;
+    QTest::newRow("extensions-internals") << QUrl("chrome://extensions-internals") << false;
     QTest::newRow("flags") << QUrl("chrome://flags") << false;
     QTest::newRow("gcm-internals") << QUrl("chrome://gcm-internals") << false;
     QTest::newRow("gpu") << QUrl("chrome://gpu") << true;
     QTest::newRow("help") << QUrl("chrome://help") << false;
     QTest::newRow("histograms") << QUrl("chrome://histograms") << true;
     QTest::newRow("history") << QUrl("chrome://history") << false;
+    QTest::newRow("history-clusters-internals") << QUrl("chrome://history-clusters-internals") << false;
     QTest::newRow("indexeddb-internals") << QUrl("chrome://indexeddb-internals") << true;
     QTest::newRow("inspect") << QUrl("chrome://inspect") << false;
     QTest::newRow("interstitials") << QUrl("chrome://interstitials") << false;
-    QTest::newRow("interventions-internals") << QUrl("chrome://interventions-internals") << false;
     QTest::newRow("invalidations") << QUrl("chrome://invalidations") << false;
     QTest::newRow("linux-proxy-config") << QUrl("chrome://linux-proxy-config") << false;
     QTest::newRow("local-state") << QUrl("chrome://local-state") << false;
     QTest::newRow("management") << QUrl("chrome://management") << false;
     QTest::newRow("media-engagement") << QUrl("chrome://media-engagement") << false;
     QTest::newRow("media-internals") << QUrl("chrome://media-internals") << true;
+    QTest::newRow("nacl") << QUrl("chrome://nacl") << false;
     QTest::newRow("net-export") << QUrl("chrome://net-export") << false;
     QTest::newRow("net-internals") << QUrl("chrome://net-internals") << true;
     QTest::newRow("network-error") << QUrl("chrome://network-error") << false;
     QTest::newRow("network-errors") << QUrl("chrome://network-errors") << true;
     QTest::newRow("ntp-tiles-internals") << QUrl("chrome://ntp-tiles-internals") << false;
     QTest::newRow("omnibox") << QUrl("chrome://omnibox") << false;
+    QTest::newRow("optimization-guide-internals") << QUrl("chrome://optimization-guide-internals") << false;
     QTest::newRow("password-manager-internals") << QUrl("chrome://password-manager-internals") << false;
     QTest::newRow("policy") << QUrl("chrome://policy") << false;
     QTest::newRow("predictors") << QUrl("chrome://predictors") << false;
@@ -3204,8 +3209,6 @@ void tst_QWebEngineView::webUIURLs_data()
     QTest::newRow("settings") << QUrl("chrome://settings") << false;
     QTest::newRow("signin-internals") << QUrl("chrome://signin-internals") << false;
     QTest::newRow("site-engagement") << QUrl("chrome://site-engagement") << false;
-    QTest::newRow("suggestions") << QUrl("chrome://suggestions") << false;
-    QTest::newRow("supervised-user-internals") << QUrl("chrome://supervised-user-internals") << false;
     QTest::newRow("sync-internals") << QUrl("chrome://sync-internals") << false;
     QTest::newRow("system") << QUrl("chrome://system") << false;
     QTest::newRow("terms") << QUrl("chrome://terms") << false;
@@ -3215,12 +3218,14 @@ void tst_QWebEngineView::webUIURLs_data()
     QTest::newRow("usb-internals") << QUrl("chrome://usb-internals") << false;
     QTest::newRow("user-actions") << QUrl("chrome://user-actions") << true;
     QTest::newRow("version") << QUrl("chrome://version") << false;
+    QTest::newRow("web-app-internals") << QUrl("chrome://web-app-internals") << false;
 #if QT_CONFIG(webengine_webrtc)
     QTest::newRow("webrtc-internals") << QUrl("chrome://webrtc-internals") << true;
 #if QT_CONFIG(webengine_extensions)
     QTest::newRow("webrtc-logs") << QUrl("chrome://webrtc-logs") << true;
 #endif // QT_CONFIG(webengine_extensions)
 #endif // QT_CONFIG(webengine_webrtc)
+    QTest::newRow("whats-new") << QUrl("chrome://whats-new") << false;
 }
 
 void tst_QWebEngineView::webUIURLs()
-- 
cgit v1.2.3


From ef98503991b548404a14c36351b34fcdafcbbc0c Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 1 Aug 2022 11:56:49 +0200
Subject: Disable tests on qemu temporally

Task-number: QTBUG-105342
Change-Id: Ic644c193329ff6c21dfffe43f52ea6f0c5a8fc3f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 603be2388eb227270fbc6d9ef0f926e7f3059b5f)
---
 tests/auto/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index e000203d9..ec566ffd7 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,3 +1,8 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+if(LINUX AND CMAKE_CROSSCOMPILING)
+    return()# FIXME
+endif()
 if(TARGET Qt::WebEngineCore)
     add_subdirectory(httpserver)
     add_subdirectory(util)
-- 
cgit v1.2.3


From d2fa9c06a46c605c95a78b6f8916d9ecda9dddac Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 8 Aug 2022 10:48:56 +0200
Subject: Only skip arm64 qemu tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems we can pass the arm32 tests.

Task-number: QTBUG-105342
Change-Id: Ic5492e43cd327119305c3731701186710f9d59c6
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit bb0a39c5dab77cc6aba6819e038dfb8182c69861)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index ec566ffd7..9b7672f67 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-if(LINUX AND CMAKE_CROSSCOMPILING)
+if(LINUX AND CMAKE_CROSSCOMPILING AND (${TEST_architecture_arch} STREQUAL "arm64"))
     return()# FIXME
 endif()
 if(TARGET Qt::WebEngineCore)
-- 
cgit v1.2.3


From 9669a4cdf302d7791d1888702cb2b5731a656fa6 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 22 Jun 2022 17:16:54 +0200
Subject: Fix single process crash when proxy pac is used

Using proxy v8 resolver ends up in race condition
when render thread tries to evaluate extension handle
and v8 proxy resolver evaluates proxy pac script.

Disable v8 proxy resolver for single process mode.
Issue tracked upstream http://crbug.com/474654

Modify the unit test to catch the crash case, the test
loads now network resource but it does not matter
as we do not check for failure or success.

Fixes: QTBUG-104436
Change-Id: Id3221d1b8b3896f0ced3d0cd7cb9d9eceeb929cc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1b6633d1ce86eaf43b750a03a785793512e487ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/proxypac/CMakeLists.txt   | 22 ++++++++++++++++++----
 tests/auto/widgets/proxypac/proxy.pac        |  2 +-
 tests/auto/widgets/proxypac/tst_proxypac.cpp | 14 +++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/proxypac/CMakeLists.txt b/tests/auto/widgets/proxypac/CMakeLists.txt
index 1dd2c8bec..d3ddfd0c5 100644
--- a/tests/auto/widgets/proxypac/CMakeLists.txt
+++ b/tests/auto/widgets/proxypac/CMakeLists.txt
@@ -21,6 +21,22 @@ set_tests_properties(tst_proxypac_file PROPERTIES
     ENVIRONMENT QTWEBENGINE_CHROMIUM_FLAGS=${fileEnvArg}
 )
 
+if(NOT (LINUX AND CMAKE_CROSSCOMPILING))
+    set(fileEnvArg "--single-process ${fileEnvArg}")
+
+    qt_internal_add_test(tst_proxypac_single_process
+        SOURCES
+            tst_proxypac.cpp
+        LIBRARIES
+            Qt::WebEngineCore
+            Test::HttpServer
+    )
+
+    set_tests_properties(tst_proxypac_single_process PROPERTIES
+        ENVIRONMENT QTWEBENGINE_CHROMIUM_FLAGS=${fileEnvArg}
+    )
+endif()
+
 qt_internal_add_test(tst_proxypac_qrc
     SOURCES
         tst_proxypac.cpp
@@ -40,8 +56,6 @@ set_tests_properties(tst_proxypac_qrc PROPERTIES
 )
 
 qt_internal_add_resource(tst_proxypac_qrc "proxypac"
-    PREFIX
-        "/"
-    FILES
-        "proxy.pac"
+    PREFIX "/"
+    FILES "proxy.pac"
 )
diff --git a/tests/auto/widgets/proxypac/proxy.pac b/tests/auto/widgets/proxypac/proxy.pac
index 1d29847b9..966c37ba5 100644
--- a/tests/auto/widgets/proxypac/proxy.pac
+++ b/tests/auto/widgets/proxypac/proxy.pac
@@ -2,6 +2,6 @@ function FindProxyForURL(url, host)
 {
    if (shExpMatch(host, "*.proxy1.com")) return "PROXY localhost:5551";
    if (shExpMatch(host, "*.proxy2.com")) return "PROXY localhost:5552";
-   return "PROXY proxy.url:8080";
+   return "DIRECT";
 }
 
diff --git a/tests/auto/widgets/proxypac/tst_proxypac.cpp b/tests/auto/widgets/proxypac/tst_proxypac.cpp
index 8667af24a..d372f77fa 100644
--- a/tests/auto/widgets/proxypac/tst_proxypac.cpp
+++ b/tests/auto/widgets/proxypac/tst_proxypac.cpp
@@ -8,7 +8,6 @@
 #include <QWebEnginePage>
 #include <QNetworkProxy>
 
-
 class tst_ProxyPac : public QObject {
     Q_OBJECT
 public:
@@ -39,11 +38,20 @@ void tst_ProxyPac::proxypac()
 
     QWebEngineProfile profile;
     QWebEnginePage page(&profile);
+
+    const bool v8_proxy_resolver_enabled = !fromEnv.contains("--single-process");
     page.load(QUrl("http://test.proxy1.com"));
-    QTRY_COMPARE(proxySpy1.count() >= 1, true);
+    QTRY_COMPARE(proxySpy1.count() >= 1, v8_proxy_resolver_enabled);
     QVERIFY(proxySpy2.count() == 0);
     page.load(QUrl("http://test.proxy2.com"));
-    QTRY_COMPARE(proxySpy2.count() >= 1 , true);
+    QTRY_COMPARE(proxySpy2.count() >= 1, v8_proxy_resolver_enabled);
+
+    // check for crash
+    QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
+    page.load(QUrl("https://contribute.qt-project.org"));
+
+    QTRY_VERIFY_WITH_TIMEOUT(!spyFinished.isEmpty(), 100000);
+
 }
 
 #include "tst_proxypac.moc"
-- 
cgit v1.2.3


From d96301b70771500d1092e8bbb2122e35e184b88a Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Sat, 16 Jul 2022 11:21:43 +0200
Subject: Increase timeouts

Trying to pass on qemu-arm64

Task-number: QTBUG-105342
Change-Id: I5eca4ef2235d26b88207decd66b06c30b9f9972f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 8e8c728517785e02e066138544dd156d54680b2c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/CMakeLists.txt                                      | 3 ---
 tests/auto/core/origins/resources/mixedSchemes.html            | 2 +-
 tests/auto/quick/inspectorserver/tst_inspectorserver.cpp       | 2 +-
 tests/auto/quick/qmltests/BLACKLIST                            | 3 +++
 tests/auto/quick/qmltests/data/TestWebEngineView.qml           | 2 +-
 tests/auto/quick/qmltests/data/tst_viewSource.qml              | 2 +-
 tests/auto/widgets/accessibility/tst_accessibility.cpp         | 6 +++---
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp             | 2 +-
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp       | 2 +-
 tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp | 2 +-
 tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp   | 2 +-
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp       | 6 +++---
 12 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 9b7672f67..ea9766469 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,8 +1,5 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-if(LINUX AND CMAKE_CROSSCOMPILING AND (${TEST_architecture_arch} STREQUAL "arm64"))
-    return()# FIXME
-endif()
 if(TARGET Qt::WebEngineCore)
     add_subdirectory(httpserver)
     add_subdirectory(util)
diff --git a/tests/auto/core/origins/resources/mixedSchemes.html b/tests/auto/core/origins/resources/mixedSchemes.html
index 260372a29..53c8c83ff 100644
--- a/tests/auto/core/origins/resources/mixedSchemes.html
+++ b/tests/auto/core/origins/resources/mixedSchemes.html
@@ -12,7 +12,7 @@
              document.getElementById("iframe").setAttribute("src", url);
              // Early fire is OK unless the test is expecting cannotLoad.
              // If timeout is too short then a false positive is possible.
-             setTimeout(() => { result = result || "cannotLoad"; }, 1000);
+             setTimeout(() => { result = result || "cannotLoad"; }, 3000);
          }
 
          addEventListener("load", function() {
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 6c22c5d33..0a0d3ee0f 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -160,7 +160,7 @@ void tst_InspectorServer::openRemoteDebuggingSession()
     // - The page list didn't return a valid inspector URL
     // - Or the front-end couldn't be loaded through the inspector HTTP server
     // - Or the web socket connection couldn't be established between the front-end and the page through the inspector server
-    QTRY_VERIFY_WITH_TIMEOUT(inspectorWebView->title().startsWith("DevTools -"), 30000);
+    QTRY_VERIFY_WITH_TIMEOUT(inspectorWebView->title().startsWith("DevTools -"), 60000);
 }
 
 QTEST_MAIN(tst_InspectorServer)
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index 2f8fa5e66..0a0a9323a 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -9,3 +9,6 @@ macos
 
 [CertificateError::test_error]
 *
+
+[WebViewFindText::test_findTextInterruptedByLoad]
+b2qt arm 64bit
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index 7f8c271d0..415985471 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -40,7 +40,7 @@ WebEngineView {
     }
     function _waitFor(predicate, timeout) {
         if (timeout === undefined)
-            timeout = 12000;
+            timeout = 30000;
         var i = 0
         while (i < timeout && !predicate()) {
             testResult.wait(50)
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml
index 44a88daab..d4449f7de 100644
--- a/tests/auto/quick/qmltests/data/tst_viewSource.qml
+++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml
@@ -122,7 +122,7 @@ TestWebEngineView {
             WebEngine.settings.errorPageEnabled = true
             webEngineView.url = row.userInputUrl;
 
-            tryCompare(loadSpy, 'count', 2);
+            tryCompare(loadSpy, 'count', 2, 12000);
             let load = loadSpy.signalArguments[1][0]
             let expectedStatus = row.loadSucceed ? WebEngineView.LoadSucceededStatus : WebEngineView.LoadFailedStatus
             compare(load.status, expectedStatus);
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index be1257b82..5bb4e822b 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -529,10 +529,10 @@ void tst_Accessibility::roles()
     QFETCH(QAccessible::Role, role);
 
     QWebEngineView webView;
+    QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished);
     webView.setHtml("<html><body>" + html + "</body></html>");
     webView.show();
-    QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished);
-    QVERIFY(spyFinished.wait());
+    QTRY_COMPARE_WITH_TIMEOUT(spyFinished.count(), 1, 20000);
 
     QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
 
@@ -542,7 +542,7 @@ void tst_Accessibility::roles()
         return;
     }
 
-    QTRY_COMPARE(view->child(0)->childCount(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(view->child(0)->childCount(), 1, 20000);
     QAccessibleInterface *document = view->child(0);
     QAccessibleInterface *element = document->child(0);
 
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 28dd5f938..9f196972d 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -277,7 +277,7 @@ void tst_LoadSignals::monotonicity()
     QVERIFY(server.start());
 
     view.load(server.url("/loadprogress/main.html"));
-    QTRY_COMPARE(loadFinishedSpy.size(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 10000);
     QVERIFY(loadFinishedSpy[0][0].toBool());
 
     QVERIFY(page.loadProgress.size() >= 3);
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 1fdf69307..a2a8279a5 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3085,7 +3085,7 @@ void tst_QWebEnginePage::loadFromQrc()
 
     // Resource not found, loading fails.
     page.load(QStringLiteral("qrc:///nope"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 10000);
     QCOMPARE(spy.takeFirst().value(0).toBool(), false);
 }
 
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 3b595f199..73b50897d 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -942,7 +942,7 @@ void tst_QWebEngineProfile::initiator()
     // Directly calling load/setUrl should have initiator QUrl(), meaning
     // browser-initiated, trusted.
     page.load(QUrl("foo:bar"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 10000);
     QCOMPARE(handler.initiator, QUrl());
 }
 
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 26ba71ae3..6a97e5db0 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -457,7 +457,7 @@ void tst_QWebEngineScript::scriptsInNestedIframes()
     QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
     page.load(QUrl("qrc:/resources/test_iframe_main.html"));
     view.show();
-    QVERIFY(spyFinished.wait());
+    QTRY_VERIFY_WITH_TIMEOUT(spyFinished.count() > 0, 20000);
 
     // Check that main frame has modified content.
     QCOMPARE(
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index fd6c56a3e..9205e4781 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -636,7 +636,7 @@ void tst_QWebEngineView::unhandledKeyEventPropagation()
 
     QSignalSpy loadFinishedSpy(&webView, SIGNAL(loadFinished(bool)));
     webView.load(QUrl("qrc:///resources/keyboardEvents.html"));
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.count() > 0, 20000);
 
     evaluateJavaScriptSync(webView.page(), "document.getElementById('first_div').focus()");
     QTRY_COMPARE(evaluateJavaScriptSync(webView.page(), "document.activeElement.id").toString(), QStringLiteral("first_div"));
@@ -1367,7 +1367,7 @@ void tst_QWebEngineView::keyboardEvents()
     view.show();
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
     view.load(QUrl("qrc:///resources/keyboardEvents.html"));
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
 
     QStringList elements;
     elements << "first_div" << "second_div";
@@ -3237,7 +3237,7 @@ void tst_QWebEngineView::webUIURLs()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
     view.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 90000);
     QCOMPARE(loadFinishedSpy.takeFirst().at(0).toBool(), supported);
 }
 
-- 
cgit v1.2.3


From d77fc39d9909111c8cea4aff11ef1033d3b89700 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Thu, 18 Aug 2022 15:53:20 +0200
Subject: Fix initial widget focus

Avoid WebEngineQuickWidget::rootObject() to steal focus from
the content item (RenderWidgetHostViewQtDelegateItem).
The root object is supposed to keep the content item alive and
not handling input events.

Fixes: QTBUG-105072
Change-Id: I18e8ff39bfe338b742416bc56f6937edcfd2bc21
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit a7d353ae7d85438b92c8e376cbf6cf92c05a0952)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../widgets/qwebengineview/tst_qwebengineview.cpp  | 56 +++++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 9205e4781..7cfe072b3 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -1146,20 +1146,22 @@ void tst_QWebEngineView::focusInternalRenderWidgetHostViewQuickItem()
     QWebEngineView *webView = new QWebEngineView;
     QWebEngineSettings *settings = webView->page()->settings();
     settings->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, false);
-    webView->resize(300, 300);
+    webView->resize(300, 100);
 
-    QHBoxLayout *layout = new QHBoxLayout;
+    QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(label);
     layout->addWidget(webView);
 
+    containerWidget->resize(300, 200);
     containerWidget->setLayout(layout);
     containerWidget->show();
     QVERIFY(QTest::qWaitForWindowExposed(containerWidget.data()));
 
     // Load the content, and check that focus is not set.
     QSignalSpy loadSpy(webView, SIGNAL(loadFinished(bool)));
-    webView->setHtml("<html><head><title>Title</title></head><body>Hello"
-                    "<input id=\"input\" type=\"text\"></body></html>");
+    webView->setHtml("<html><body>"
+                     "  <input id='input1' type='text'/>"
+                     "</body></html>");
     QTRY_COMPARE(loadSpy.count(), 1);
     QTRY_COMPARE(webView->hasFocus(), false);
 
@@ -1169,15 +1171,43 @@ void tst_QWebEngineView::focusInternalRenderWidgetHostViewQuickItem()
     // Check that focus is set in QWebEngineView and all internal classes.
     QTRY_COMPARE(webView->hasFocus(), true);
 
-    QQuickWidget *renderWidgetHostViewQtDelegateWidget =
-            qobject_cast<QQuickWidget *>(webView->focusProxy());
-    QVERIFY(renderWidgetHostViewQtDelegateWidget);
-    QTRY_COMPARE(renderWidgetHostViewQtDelegateWidget->hasFocus(), true);
-
-    QQuickItem *renderWidgetHostViewQuickItem =
-            renderWidgetHostViewQtDelegateWidget->rootObject();
-    QVERIFY(renderWidgetHostViewQuickItem);
-    QTRY_COMPARE(renderWidgetHostViewQuickItem->hasFocus(), true);
+    QQuickWidget *webEngineQuickWidget = qobject_cast<QQuickWidget *>(webView->focusProxy());
+    QVERIFY(webEngineQuickWidget);
+    QTRY_COMPARE(webEngineQuickWidget->hasFocus(), true);
+
+    QQuickItem *root = webEngineQuickWidget->rootObject();
+    // The root item should not has focus, otherwise it would handle input events
+    // instead of the RenderWidgetHostViewQtDelegateItem.
+    QVERIFY(!root->hasFocus());
+
+    QCOMPARE(root->childItems().size(), 1);
+    QQuickItem *renderWidgetHostViewQtDelegateItem = root->childItems().at(0);
+    QVERIFY(renderWidgetHostViewQtDelegateItem);
+    QTRY_COMPARE(renderWidgetHostViewQtDelegateItem->hasFocus(), true);
+    // Test if QWebEngineView handles key events.
+    QTRY_COMPARE(renderWidgetHostViewQtDelegateItem->hasActiveFocus(), true);
+
+    // Key events should not be forwarded to the unfocused input field.
+    QTRY_COMPARE(evaluateJavaScriptSync(webView->page(),
+                                        "document.getElementById('input1').value").toString(),
+                                        QStringLiteral(""));
+    QTest::keyClick(webView->focusProxy(), Qt::Key_X);
+    QTest::qWait(100);
+    QTRY_COMPARE(evaluateJavaScriptSync(webView->page(),
+                 "document.getElementById('input1').value").toString(),
+                 QStringLiteral(""));
+
+    // Focus the input field. Focus rectangle is expected to appear around the input field.
+    evaluateJavaScriptSync(webView->page(), "document.getElementById('input1').focus()");
+    QTRY_COMPARE(evaluateJavaScriptSync(webView->page(),
+                                        "document.activeElement.id").toString(),
+                                        QStringLiteral("input1"));
+
+    // Test the focused input field with a key event.
+    QTest::keyClick(webView->focusProxy(), Qt::Key_X);
+    QTRY_COMPARE(evaluateJavaScriptSync(webView->page(),
+                                        "document.getElementById('input1').value").toString(),
+                                        QStringLiteral("x"));
 }
 
 void tst_QWebEngineView::doNotBreakLayout()
-- 
cgit v1.2.3


From a4cfac9a64273aa2c00e10c56ec40999fe778d7c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 8 Sep 2021 15:12:42 +0200
Subject: Reestablish default config for embedded builds

Was missing from the CMake switch-over

Change-Id: I0171d395f9e66c072e368b7019539fc29ff865b8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 0def03920e07d6a2e193cbd2537643d668bc979a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/BLACKLIST         | 3 +++
 tests/auto/widgets/qwebengineview/BLACKLIST | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index 0a0a9323a..36c737693 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -12,3 +12,6 @@ macos
 
 [WebViewFindText::test_findTextInterruptedByLoad]
 b2qt arm 64bit
+
+[WebEngineViewLoadUrl::test_loadStartedAfterInPageNavigation]
+b2qt
diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST
index ed022878e..5d9cc038a 100644
--- a/tests/auto/widgets/qwebengineview/BLACKLIST
+++ b/tests/auto/widgets/qwebengineview/BLACKLIST
@@ -6,3 +6,6 @@ windows
 
 [navigateOnDrop:file_no_navigate]
 windows
+
+[horizontalScrollbarTest]
+b2qt # different scrollbar
-- 
cgit v1.2.3


From 16ec257ab16eb69772818f1457e22e71b512ea67 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 27 Jul 2022 16:12:50 +0200
Subject: Fix crashes of combobox popup tests

Offscreenwindow from quickwidget is a top level window,
which was from time to time used as "popup" window in the test
instead of widgetwindow of webengineview.
Check if window is offscreenwindow and do not consider it
as valid window in the test.
Moreover popup should be closed in the end of test, however
checking for offscreen window would result in bogus outcome
as offscreen window is destroyed before quickwidgetwindow.

Task-number: QTBUG-105342
Change-Id: Ibfeab0cad0bc43690c2458cb97738b4b5ea132f4
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 7415a127df0ab21b703d1a549abe595900e76fab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../widgets/qwebenginepage/tst_qwebenginepage.cpp  | 31 +++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index a2a8279a5..ed1c1cae6 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -69,6 +69,8 @@
 #include <qwebengineview.h>
 #include <qimagewriter.h>
 #include <QColorSpace>
+#include <QQuickRenderControl>
+#include <QQuickWindow>
 
 static void removeRecursive(const QString& dirname)
 {
@@ -1324,7 +1326,9 @@ static QWindow *findNewTopLevelWindow(const QWindowList &oldTopLevelWindows)
 {
     const auto tlws = QGuiApplication::topLevelWindows();
     for (auto w : tlws) {
-        if (!oldTopLevelWindows.contains(w)) {
+        // note 'offscreen' window is a top-level window
+        if (!oldTopLevelWindows.contains(w)
+            && !QQuickRenderControl::renderWindowFor(qobject_cast<QQuickWindow *>(w))) {
             return w;
         }
     }
@@ -1344,28 +1348,29 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     view.move(QGuiApplication::primaryScreen()->availableGeometry().topLeft());
     view.resize(640, 480);
     view.show();
-
-    QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+    QSignalSpy spyLoadFinished(&view, SIGNAL(loadFinished(bool)));
     view.setHtml(QLatin1String("<html><head></head><body><select id='foo'>"
                                "<option>fran</option><option>troz</option>"
                                "</select></body></html>"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(spyLoadFinished.count(), 1);
     const auto oldTlws = QGuiApplication::topLevelWindows();
-
     QFETCH(bool, withTouch);
     QWindow *window = view.windowHandle();
-    makeClick(window, withTouch, elementCenter(view.page(), "foo"));
-
+    auto pos = elementCenter(view.page(), "foo");
+    makeClick(window, withTouch, pos);
     QWindow *popup = nullptr;
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QVERIFY(QTest::qWaitForWindowExposed(popup));
+    QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
     QTRY_VERIFY(!popup->position().isNull());
     QPoint popupPos = popup->position();
-
+    QPointer<QWindow> pw(popup);
     // Close the popup by clicking somewhere into the page.
     makeClick(window, withTouch, QPoint(1, 1));
     QTRY_VERIFY(!QGuiApplication::topLevelWindows().contains(popup));
-
+    QTRY_VERIFY(!pw);
     auto jsViewPosition = [&view]() {
         QLatin1String script("(function() { return [window.screenX, window.screenY]; })()");
         QVariantList posList = evaluateJavaScriptSync(view.page(), script).toList();
@@ -1384,6 +1389,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     QTRY_COMPARE(jsViewPosition(), view.pos());
     makeClick(window, withTouch, elementCenter(view.page(), "foo"));
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
     QTRY_VERIFY(!popup->position().isNull());
     QCOMPARE(popupPos + offset, popup->position());
@@ -1413,6 +1419,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     mainWidget.move(screen->availableGeometry().topLeft());
     mainWidget.resize(640, 480);
     mainWidget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&mainWidget));
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     view.setHtml(QLatin1String("<html><head></head><body><select autofocus id='foo'>"
@@ -1427,6 +1434,8 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
 
     QWindow *popup = nullptr;
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QVERIFY(QTest::qWaitForWindowExposed(popup));
+    QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
     QTRY_VERIFY(!popup->position().isNull());
     QPoint popupPos = popup->position();
@@ -1452,8 +1461,12 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
 
     makeClick(window, withTouch, view.mapTo(view.window(), elementCenter(view.page(), "foo")));
     QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QVERIFY(QTest::qWaitForWindowExposed(popup));
+    QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(!popup->position().isNull());
     QCOMPARE(popupPos + QPoint(offset, 0), popup->position());
+    makeClick(window, withTouch, QPoint(1, 1));
+    QTRY_VERIFY(!QGuiApplication::topLevelWindows().contains(popup));
 }
 
 #ifdef Q_OS_MACOS
-- 
cgit v1.2.3


From ce3d5bccc89ae9a28da3415019a55937eb71beff Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Wed, 9 Mar 2022 08:50:45 +0100
Subject: Begin adding Qt Quick Pdf tests

...starting with tests for the PdfMultiPageView component.

The file bookmarksAndLinks.pdf is fx/other/bookmarkgetcolor.pdf from
https://pdfium.googlesource.com/pdfium_tests

pdf-sample.protected.pdf is from
55b863f2dd2773290c63259c3835b19dcb277098

The shared/util implementation is adapted from the Qt Quick 3D module,
with showView() adapted from qtdeclarative's viewtestutils.cpp.

Change-Id: I1458968846d33f262465a368fdaec771d4979b67
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 9ae10a349a8525ebf5975ba4d17271f98e80f708)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/CMakeLists.txt                          |   1 +
 tests/auto/pdfquick/CMakeLists.txt                 |   1 +
 tests/auto/pdfquick/multipageview/CMakeLists.txt   |  30 ++
 .../multipageview/data/bookmarksAndLinks.pdf       | 317 +++++++++++++++++++++
 .../pdfquick/multipageview/data/multiPageView.qml  |   8 +
 .../multipageview/data/pdf-sample.protected.pdf    | Bin 0 -> 9138 bytes
 .../pdfquick/multipageview/tst_multipageview.cpp   | 237 +++++++++++++++
 tests/auto/pdfquick/shared/util.cpp                | 110 +++++++
 tests/auto/pdfquick/shared/util.h                  |  58 ++++
 9 files changed, 762 insertions(+)
 create mode 100644 tests/auto/pdfquick/CMakeLists.txt
 create mode 100644 tests/auto/pdfquick/multipageview/CMakeLists.txt
 create mode 100644 tests/auto/pdfquick/multipageview/data/bookmarksAndLinks.pdf
 create mode 100644 tests/auto/pdfquick/multipageview/data/multiPageView.qml
 create mode 100644 tests/auto/pdfquick/multipageview/data/pdf-sample.protected.pdf
 create mode 100644 tests/auto/pdfquick/multipageview/tst_multipageview.cpp
 create mode 100644 tests/auto/pdfquick/shared/util.cpp
 create mode 100644 tests/auto/pdfquick/shared/util.h

(limited to 'tests')

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index ea9766469..0a651e9ad 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -13,4 +13,5 @@ if(TARGET Qt::WebEngineWidgets)
 endif()
 if(TARGET Qt::Pdf)
     add_subdirectory(pdf)
+    add_subdirectory(pdfquick)
 endif()
diff --git a/tests/auto/pdfquick/CMakeLists.txt b/tests/auto/pdfquick/CMakeLists.txt
new file mode 100644
index 000000000..9f79459b2
--- /dev/null
+++ b/tests/auto/pdfquick/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(multipageview)
diff --git a/tests/auto/pdfquick/multipageview/CMakeLists.txt b/tests/auto/pdfquick/multipageview/CMakeLists.txt
new file mode 100644
index 000000000..99bf8a675
--- /dev/null
+++ b/tests/auto/pdfquick/multipageview/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_multipageview
+    SOURCES
+        tst_multipageview.cpp
+        ../shared/util.cpp ../shared/util.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Quick
+        Qt::PdfQuickPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_multipageview CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_multipageview CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
+
diff --git a/tests/auto/pdfquick/multipageview/data/bookmarksAndLinks.pdf b/tests/auto/pdfquick/multipageview/data/bookmarksAndLinks.pdf
new file mode 100644
index 000000000..aa0b99039
--- /dev/null
+++ b/tests/auto/pdfquick/multipageview/data/bookmarksAndLinks.pdf
@@ -0,0 +1,317 @@
+%PDF-1.7
+
+1 0 obj
+<<
+    /Type /Catalog
+    /PageMode /FullScreen
+    /Outlines 6 0 R
+    /Pages 2 0 R
+    /Names 50 0 R
+    /PageLabels 23 0 R
+    /ViewerPreferences<</NonFullScreenPageMode (UseThumbs)>>
+>>
+endobj
+
+50 0 obj
+<<
+    /Dests <</Names [ (ToTest2) [4 0 R /XYZ 300 300 1] (ToTest3) [5 0 R /XYZ 290 10 0.5] (ToTest1) [3 0 R /XYZ 600 800 1] ]>>
+>>
+endobj
+
+23 0 obj
+<<
+    /Nums [0 <</S /D /P(test )>> 3 <</S /A >> 4<</S /R/St  >> 5<</S /r/St  >> ]
+    /Limits [0 5]
+>>
+endobj
+
+2 0 obj
+<<
+    /Type /Pages
+    /Kids [3 0 R 4 0 R 5 0 R]
+    /Count 3
+>>
+endobj
+
+3 0 obj
+<<
+    /Type /Page
+    /Parent 2 0 R
+    /MediaBox [0 10 600 800]
+    /Annots [24 0 R 25 0 R]
+    /Contents 16 0 R
+    /Resources <<
+                  /Font <</F1 18 0 R>>
+               >>
+>>
+endobj
+
+24 0 obj
+<<
+    /Subtype /Link
+    /Border [0 0 0]
+    /Dest (ToTest2)
+    /A << /Type /Action
+		/S /GoTo
+		/D [5 0 R /FitR ¨C4 399 199 533]
+		>>
+    /Rect [10 690 150 720] 
+    
+>>
+endobj
+
+25 0 obj
+<<
+    /Subtype /Link
+    /Border [0 0 0]
+    /Dest (ToTest3)
+    /Rect [10 630 150 650] 
+>>
+endobj
+
+
+16 0 obj
+<<  /Length  0  >>
+  stream
+   BT
+    /F1 72 Tf
+    200 200 TD
+    0 0 1 RG
+    5 Tr
+    (Test_1) Tj
+   0 800 m
+   600 0 l S
+   /F1 30 Tf
+   0 1 0 RG
+    1 Tr
+   -190 490 TD
+   (GO Test_2) Tj
+   0 -50 TD
+   5 w
+   2 Tr
+   1 0 0 RG
+   (GO Test_3) Tj
+   ET 
+  endstream
+endobj
+
+
+endobj
+
+18 0 obj
+<<
+    /Type /Font
+    /Subtype /Type1
+    /Name /F1
+    /BaseFont /Helvetica
+>>
+endobj
+
+4 0 obj
+<<
+    /Type /Page
+    /Parent 2 0 R
+    /MediaBox [10 0 500 700]
+    /Annots [60 0 R]
+    /Contents 19 0 R
+    /Resources << 
+                    /Font <</F2 20 0 R>> 
+               >>
+>>
+endobj
+
+19 0 obj
+<< /Length 0 >>
+stream
+BT
+    1 -0.7 0 1 30 100 cm 
+    /F2 50 Tf
+    10 50 TD
+    (TEST_2) Tj
+   
+    1 0.7 0 1 -30 -100 cm
+    /F2 25 Tf
+    1 0 1 RG
+    7 w
+    100 60 TD
+  
+    (GO Test_1) Tj
+    100 100 140 40 re S f
+ET
+endstream
+endobj
+
+20 0 obj
+<<
+   	 /Type  /Font
+	/Subtype  /TrueType
+	/Name /F2
+	/BaseFont  /NewYork , Bold
+	/FirstChar  0
+	/LastChar  255
+	/Widths  23 0 R
+	/FontDescriptor  7 0 R
+	/Encoding  /MacRomanEncoding
+>>
+endobj
+
+60 0 obj
+<<
+    /Subtype /Link
+    /Border [0 0 0]
+    /Dest (ToTest1)
+    /Rect [110 110 230 150] 
+>>
+endobj
+
+5 0 obj
+<<
+    /Type /Page
+    /Parent 2 0 R
+    /MediaBox [-10 -10 400 600]
+    /Annots [61 0 R]
+    /Contents 21 0 R
+    /Resources << /Font <</F3 22 0 R>> >>
+>>
+endobj
+
+21 0 obj
+<< /Length 0 >>
+stream
+BT
+    /F3 30 Tf
+    290 10 TD
+    (TEST_3) Tj
+    -50 90 TD
+    (GO Test_2)Tj
+ET
+endstream
+endobj
+
+22 0 obj
+<<
+   	 /Type  /Font
+	/Subtype  /Type1
+	/Name /F3
+	/BaseFont  /Courier-Bold
+>>
+endobj
+
+61 0 obj
+<<
+    /Subtype /Link
+    /Border [0 0 0]
+    /Dest (ToTest2)
+    /Rect [240 90 400 130] 
+>>
+
+6 0 obj
+<<
+    /Type /Outlines
+    /First 7 0 R
+    /Last 11 0 R
+    /Count 4 0 R
+>>
+endobj
+
+7 0 obj
+<<
+    /Title (First)
+    /Parent 6 0 R
+    /Next 8 0 R
+    /C [1 0 0]
+    /Dest  [ 3 0 R  /XYZ  600 800 0.5 ] 
+>>
+endobj
+
+8 0 obj
+<<
+    /Title (Second)
+    /Parent 6 0 R
+    /Prev 7 0 R
+    /Next 9 0 R
+    /C [0 1 0]
+ %   /Dest  [ 4 0 R  /XYZ  500 700 null ] 
+/Dest (ToTest2)
+>>
+endobj
+
+9 0 obj
+<<
+    /Title (Third)
+    /Parent 6 0 R
+    /Prev 8 0 R
+    /Next 10 0 R
+    /C [0 0 1]
+    /Dest  [ 5 0 R  /XYZ  400 600 0.8 ] 
+>>
+endobj
+
+10 0 obj
+<<
+    /Title (Fourth)
+    /Parent 6 0 R
+    /Prev 9 0 R
+    /Next 11 0 R
+>>
+endobj
+
+11 0 obj
+<<
+    /Title (Fivth)
+    /Parent 6 0 R
+    /Prev 10 0 R
+    /First 12 0 R
+    /Last 15 0 R
+    /Count 4
+>>
+endobj
+
+12 0 obj
+<<
+    /Title (Fivth_1)
+    /Parent 11 0 R
+    /Next 13 0 R
+>>
+endobj
+
+13 0 obj
+<<
+    /Title (Fivth_2)
+    /Parent 11 0 R
+    /Prev 12 0 R
+    /Next 14 0 R
+>>
+endobj
+
+14 0 obj
+<<
+    /Title (Fivth_3)
+    /Parent 11 0 R
+    /Prev 13 0 R
+    /Next 15 0 R
+>>
+endobj
+
+15 0 obj
+<<
+    /Title (Fivth_4)
+    /Parent 11 0 R
+    /Prev 14 0 R
+>>
+endobj
+
+
+
+
+xref
+0000000000 65536 f
+
+trailer
+<<
+   /Size 0
+   /Root 1 0 R
+>>
+startxref
+0
+%%EOF
diff --git a/tests/auto/pdfquick/multipageview/data/multiPageView.qml b/tests/auto/pdfquick/multipageview/data/multiPageView.qml
new file mode 100644
index 000000000..bf88180ce
--- /dev/null
+++ b/tests/auto/pdfquick/multipageview/data/multiPageView.qml
@@ -0,0 +1,8 @@
+import QtQuick
+import QtQuick.Pdf
+
+PdfMultiPageView {
+    width: 480; height: 480
+    property alias source: document.source
+    document: PdfDocument { id: document }
+}
diff --git a/tests/auto/pdfquick/multipageview/data/pdf-sample.protected.pdf b/tests/auto/pdfquick/multipageview/data/pdf-sample.protected.pdf
new file mode 100644
index 000000000..d76fdd1a6
Binary files /dev/null and b/tests/auto/pdfquick/multipageview/data/pdf-sample.protected.pdf differ
diff --git a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
new file mode 100644
index 000000000..fd58c7e24
--- /dev/null
+++ b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
@@ -0,0 +1,237 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include <QSignalSpy>
+#include <QTest>
+#include <QtCore/QLoggingCategory>
+#include <QtGui/QClipboard>
+#include <QtGui/QPointingDevice>
+#include <QtQuick/QQuickView>
+#include <QtPdfQuick/private/qquickpdflinkmodel_p.h>
+#include <QtPdfQuick/private/qquickpdfsearchmodel_p.h>
+#include <QtPdfQuick/private/qquickpdfpageimage_p.h>
+#include "../shared/util.h"
+
+Q_LOGGING_CATEGORY(lcTests, "qt.pdf.tests")
+
+class tst_MultiPageView : public QQuickDataTest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void internalLink_data();
+    void internalLink();
+    void password();
+    void selectionAndClipboard();
+    void search();
+
+private:
+    QScopedPointer<QPointingDevice> touchscreen = QScopedPointer<QPointingDevice>(QTest::createTouchDevice());
+};
+
+void tst_MultiPageView::internalLink_data()
+{
+    QTest::addColumn<int>("linkIndex");
+    QTest::addColumn<int>("expectedPage");
+    QTest::addColumn<qreal>("expectedZoom");
+    QTest::addColumn<QPoint>("expectedScroll");
+
+    QTest::newRow("first link") << 0 << 1 << qreal(1) << QPoint(134, 1276);
+    // TODO fails because it zooms out, and the view leaves gaps between pages currently
+//    QTest::newRow("second link") << 1 << 2 << qreal(0.5) << QPoint(0, 717);
+}
+
+void tst_MultiPageView::internalLink()
+{
+    QFETCH(int, linkIndex);
+    QFETCH(int, expectedPage);
+    QFETCH(qreal, expectedZoom);
+    QFETCH(QPoint, expectedScroll);
+
+    QQuickView window;
+    QVERIFY(showView(window, testFileUrl("multiPageView.qml")));
+    QQuickItem *pdfView = window.rootObject();
+    QVERIFY(pdfView);
+    pdfView->setProperty("source", "bookmarksAndLinks.pdf");
+    QTRY_COMPARE(pdfView->property("currentPageRenderingStatus").toInt(), QQuickPdfPageImage::Ready);
+
+    QQuickItem *table = static_cast<QQuickItem *>(findFirstChild(pdfView, "QQuickTableView"));
+    QVERIFY(table);
+    QQuickItem *firstPage = tableViewItemAtCell(table, 0, 0);
+    QVERIFY(firstPage);
+    QQuickPdfLinkModel *linkModel = firstPage->findChild<QQuickPdfLinkModel*>();
+    QVERIFY(linkModel);
+    QQuickItem *repeater = qobject_cast<QQuickItem *>(linkModel->parent());
+    QVERIFY(repeater);
+    QVERIFY(repeater->property("count").toInt() > linkIndex);
+
+    QCOMPARE(pdfView->property("backEnabled").toBool(), false);
+    QCOMPARE(pdfView->property("forwardEnabled").toBool(), false);
+
+    // get the PdfLinkDelegate instance, which has a TapHandler declared inside
+    QQuickItem *linkDelegate = repeaterItemAt(repeater, linkIndex);
+    QVERIFY(linkDelegate);
+    const auto modelIdx = linkModel->index(linkIndex);
+    const int linkPage = linkModel->data(modelIdx, int(QPdfLinkModel::Role::Page)).toInt();
+    QVERIFY(linkPage >= 0);
+    const QPointF linkLocation = linkModel->data(modelIdx, int(QPdfLinkModel::Role::Location)).toPointF();
+    const qreal linkZoom = linkModel->data(modelIdx, int(QPdfLinkModel::Role::Zoom)).toReal();
+
+    // click on it, and check whether it went to the right place
+    const auto point = linkDelegate->position().toPoint() + QPoint(15, 15);
+    QTest::mouseClick(&window, Qt::LeftButton, Qt::NoModifier, point);
+    QTRY_COMPARE(tableViewContentPos(table).y(), expectedScroll.y());
+    const auto linkScrollPos = tableViewContentPos(table);
+    qCDebug(lcTests, "clicked link @ %d, %d and expected scrolling to %d, %d; actually scrolled to %d, %d",
+            point.x(), point.y(), expectedScroll.x(), expectedScroll.y(), linkScrollPos.x(), linkScrollPos.y());
+    QVERIFY(qAbs(linkScrollPos.x() - expectedScroll.x()) < 15);
+    QTRY_COMPARE(pdfView->property("currentPageRenderingStatus").toInt(), QQuickPdfPageImage::Ready);
+    QCOMPARE(pdfView->property("currentPage").toInt(), linkPage);
+    QCOMPARE(linkPage, expectedPage);
+    QCOMPARE(pdfView->property("renderScale").toReal(), linkZoom);
+    QCOMPARE(linkZoom, expectedZoom);
+    qCDebug(lcTests, "link %d goes to page %d location {%lf,%lf} zoom %lf scroll to {%lf,%lf}",
+            linkIndex, linkPage, linkLocation.x(), linkLocation.y(), linkZoom,
+            table->property("contentX").toReal(), table->property("contentY").toReal());
+
+    // check that we can go back to where we came from
+    QCOMPARE(pdfView->property("backEnabled").toBool(), true);
+    QCOMPARE(pdfView->property("forwardEnabled").toBool(), false);
+    QVERIFY(QMetaObject::invokeMethod(pdfView, "back"));
+    QTRY_COMPARE(tableViewContentPos(table), QPoint(0, 0));
+    QCOMPARE(pdfView->property("currentPage").toInt(), 0);
+    QCOMPARE(pdfView->property("renderScale").toReal(), qreal(1));
+
+    // and then forward again
+    QCOMPARE(pdfView->property("backEnabled").toBool(), false);
+    QCOMPARE(pdfView->property("forwardEnabled").toBool(), true);
+    QVERIFY(QMetaObject::invokeMethod(pdfView, "forward"));
+    QTRY_COMPARE(tableViewContentPos(table), linkScrollPos);
+    QCOMPARE(pdfView->property("currentPage").toInt(), linkPage);
+    QCOMPARE(pdfView->property("renderScale").toReal(), linkZoom);
+}
+
+void tst_MultiPageView::password()
+{
+    QQuickView window;
+    QVERIFY(showView(window, testFileUrl("multiPageView.qml")));
+    QQuickItem *pdfView = window.rootObject();
+    QVERIFY(pdfView);
+    QQuickPdfDocument *doc = pdfView->property("document").value<QQuickPdfDocument*>();
+    QVERIFY(doc);
+    QPdfDocument *cppDoc = static_cast<QPdfDocument *>(qmlExtendedObject(doc));
+    QVERIFY(cppDoc);
+    QSignalSpy passwordRequiredSpy(doc, SIGNAL(passwordRequired()));
+    // actually QPdfDocument::passwordRequired, but QML_EXTENDED gives us this signal virtually in QQuickPdfDocument
+    QVERIFY(passwordRequiredSpy.isValid());
+    QSignalSpy passwordChangedSpy(doc, SIGNAL(passwordChanged()));
+    // actually QPdfDocument::passwordChanged, but QML_EXTENDED gives us this signal virtually in QQuickPdfDocument
+    QVERIFY(passwordChangedSpy.isValid());
+    QSignalSpy statusChangedSpy(doc, SIGNAL(statusChanged(QPdfDocument::Status)));
+    // actually QPdfDocument::statusChanged, but QML_EXTENDED gives us this signal virtually in QQuickPdfDocument
+    QVERIFY(statusChangedSpy.isValid());
+    QSignalSpy pageCountChangedSpy(doc, SIGNAL(pageCountChanged(int)));
+    // QPdfDocument::pageCountChanged(int), but QML_EXTENDED gives us this signal virtually in QQuickPdfDocument
+    QVERIFY(pageCountChangedSpy.isValid());
+    QSignalSpy extPageCountChangedSpy(cppDoc, &QPdfDocument::pageCountChanged);
+    // actual QPdfDocument::pageCountChanged(int), for comparison with the illusory QQuickPdfDocument::pageCountChanged
+    QVERIFY(extPageCountChangedSpy.isValid());
+
+    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
+
+    QTRY_COMPARE(passwordRequiredSpy.count(), 1);
+    qCDebug(lcTests) << "error while awaiting password" << doc->error()
+                     << "passwordRequired count" << passwordRequiredSpy.count()
+                     << "statusChanged count" << statusChangedSpy.count();
+    QCOMPARE(doc->property("status").toInt(), int(QPdfDocument::Status::Error));
+    QCOMPARE(pageCountChangedSpy.count(), 0);
+    QCOMPARE(extPageCountChangedSpy.count(), 0);
+    QCOMPARE(statusChangedSpy.count(), 2); // Loading and then Error
+    statusChangedSpy.clear();
+    QVERIFY(doc->setProperty("password", u"Qt"_qs));
+    QCOMPARE(passwordChangedSpy.count(), 1);
+    QTRY_COMPARE(doc->property("status").toInt(), int(QPdfDocument::Status::Ready));
+    qCDebug(lcTests) << "after setPassword" << doc->error()
+                     << "passwordChanged count" << passwordChangedSpy.count()
+                     << "statusChanged count" << statusChangedSpy.count()
+                     << "pageCountChanged count" << pageCountChangedSpy.count();
+    QCOMPARE(statusChangedSpy.count(), 2); // Loading and then Ready
+    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(extPageCountChangedSpy.count(), pageCountChangedSpy.count());
+}
+
+void tst_MultiPageView::selectionAndClipboard()
+{
+    QQuickView window;
+    QVERIFY(showView(window, testFileUrl("multiPageView.qml")));
+    QQuickItem *pdfView = window.rootObject();
+    QVERIFY(pdfView);
+    QQuickPdfDocument *doc = pdfView->property("document").value<QQuickPdfDocument*>();
+    QVERIFY(doc);
+    QVERIFY(doc->setProperty("password", u"Qt"_qs));
+    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
+    QTRY_COMPARE(pdfView->property("currentPageRenderingStatus").toInt(), QQuickPdfPageImage::Ready);
+
+    QVERIFY(QMetaObject::invokeMethod(pdfView, "selectAll"));
+    QString sel = pdfView->property("selectedText").toString();
+    QCOMPARE(sel.length(), 1073);
+
+#if QT_CONFIG(clipboard)
+    QClipboard *clip = qApp->clipboard();
+    if (clip->supportsSelection())
+        QCOMPARE(clip->text(QClipboard::Selection), sel);
+    QVERIFY(QMetaObject::invokeMethod(pdfView, "copySelectionToClipboard"));
+    QCOMPARE(clip->text(QClipboard::Clipboard), sel);
+#endif // clipboard
+}
+
+void tst_MultiPageView::search()
+{
+    QQuickView window;
+    QVERIFY(showView(window, testFileUrl("multiPageView.qml")));
+    window.setResizeMode(QQuickView::SizeRootObjectToView);
+    window.resize(200, 200);
+    QQuickItem *pdfView = window.rootObject();
+    QVERIFY(pdfView);
+    QTRY_COMPARE(pdfView->width(), 200);
+    QQuickPdfDocument *doc = pdfView->property("document").value<QQuickPdfDocument*>();
+    QVERIFY(doc);
+    QVERIFY(doc->setProperty("password", u"Qt"_qs));
+    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
+    QTRY_COMPARE(pdfView->property("currentPageRenderingStatus").toInt(), QQuickPdfPageImage::Ready);
+    QPdfSearchModel *searchModel = pdfView->property("searchModel").value<QPdfSearchModel*>();
+    QVERIFY(searchModel);
+    QQuickItem *table = static_cast<QQuickItem *>(findFirstChild(pdfView, "QQuickTableView"));
+    QVERIFY(table);
+    QQuickItem *firstPage = tableViewItemAtCell(table, 0, 0);
+    QVERIFY(firstPage);
+    QObject *multiline = findFirstChild(firstPage, "QQuickPathMultiline");
+    QVERIFY(multiline);
+
+    pdfView->setProperty("searchString", u"PDF"_qs);
+    QTRY_COMPARE(searchModel->rowCount(QModelIndex()), 7); // occurrences of the word "PDF" in this file
+    const int count = searchModel->rowCount(QModelIndex());
+    QList<QList<QPointF>> resultOutlines = multiline->property("paths").value<QList<QList<QPointF>>>();
+    QCOMPARE(resultOutlines.count(), 7);
+    QPoint contentPos = tableViewContentPos(table);
+    int movements = 0;
+    for (int i = 0; i < count; ++i) {
+        // only one page, so IndexOnPage data is the same as overall index
+        QCOMPARE(i, searchModel->data(searchModel->index(i), int(QPdfSearchModel::Role::IndexOnPage)).toInt());
+        QCOMPARE(resultOutlines.at(i).count(), 5); // 5-point polygon is a rectangle (including drawing back to the start, to close it)
+        QCOMPARE(resultOutlines.at(i).first(), searchModel->data(searchModel->index(i), int(QPdfSearchModel::Role::Location)).toPointF());
+
+        QVERIFY(QMetaObject::invokeMethod(pdfView, "searchForward"));
+        QTest::qWait(500); // animation time; but it doesn't always need to move
+        // TODO maybe: if movement starts, wait for it to stop somehow?
+        qCDebug(lcTests) << i << resultOutlines.at(i) << "scrolled to" << tableViewContentPos(table);
+        if (tableViewContentPos(table) != contentPos)
+            ++movements;
+        contentPos = tableViewContentPos(table);
+    }
+    qCDebug(lcTests) << "total movements" << movements;
+    QVERIFY(movements > 4);
+}
+
+QTEST_MAIN(tst_MultiPageView)
+#include "tst_multipageview.moc"
diff --git a/tests/auto/pdfquick/shared/util.cpp b/tests/auto/pdfquick/shared/util.cpp
new file mode 100644
index 000000000..c540ebfa6
--- /dev/null
+++ b/tests/auto/pdfquick/shared/util.cpp
@@ -0,0 +1,110 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include "util.h"
+#include <QtQuick/QQuickItem>
+
+QQuickDataTest::QQuickDataTest() :
+    m_initialized(false),
+#ifdef QT_TESTCASE_BUILDDIR
+    m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)),
+#else
+    m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0)),
+#endif
+
+    m_dataDirectoryUrl(m_dataDirectory.startsWith(QLatin1Char(':'))
+        ? QUrl(QLatin1String("qrc") + m_dataDirectory)
+        : QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/')))
+{
+}
+
+QQuickDataTest::~QQuickDataTest()
+{
+}
+
+void QQuickDataTest::initTestCase()
+{
+    QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found");
+    m_directory = QFileInfo(m_dataDirectory).absolutePath();
+    if (m_dataDirectoryUrl.scheme() != QLatin1String("qrc"))
+        QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory));
+
+    if (QGuiApplication::platformName() == QLatin1String("offscreen")
+        || QGuiApplication::platformName() == QLatin1String("minimal"))
+    {
+        QSKIP("Skipping visual tests due to running with offscreen/minimal");
+    }
+
+    m_initialized = true;
+}
+
+void QQuickDataTest::cleanupTestCase()
+{
+    m_initialized = false;
+}
+
+QString QQuickDataTest::testFile(const QString &fileName) const
+{
+    if (m_directory.isEmpty())
+        qFatal("QQuickDataTest::initTestCase() not called.");
+    QString result = m_dataDirectory;
+    result += QLatin1Char('/');
+    result += fileName;
+    return result;
+}
+
+QObject *QQuickDataTest::findFirstChild(QObject *parent, const char *className)
+{
+    const auto children = parent->findChildren<QObject*>();
+    for (QObject *child : children) {
+        if (child->inherits(className))
+            return child;
+    }
+    return nullptr;
+}
+
+bool QQuickDataTest::showView(QQuickView &view, const QUrl &url)
+{
+    view.setSource(url);
+    while (view.status() == QQuickView::Loading)
+        QTest::qWait(10);
+    if (view.status() != QQuickView::Ready)
+        return false;
+    const QRect screenGeometry = view.screen()->availableGeometry();
+    const QSize size = view.size();
+    const QPoint offset = QPoint(size.width() / 2, size.height() / 2);
+    view.setFramePosition(screenGeometry.center() - offset);
+#if QT_CONFIG(cursor) // Get the cursor out of the way.
+     QCursor::setPos(view.geometry().topRight() + QPoint(100, 100));
+#endif
+    view.show();
+    if (!QTest::qWaitForWindowExposed(&view))
+        return false;
+    if (!view.rootObject())
+        return false;
+    return true;
+}
+
+QQuickItem *QQuickDataTest::repeaterItemAt(QQuickItem *repeater, int i)
+{
+    static const QMetaMethod itemAtMethod = repeater->metaObject()->method(
+                repeater->metaObject()->indexOfMethod("itemAt(int)"));
+    QQuickItem *ret = nullptr;
+    itemAtMethod.invoke(repeater, Qt::DirectConnection, Q_RETURN_ARG(QQuickItem*, ret), Q_ARG(int, i));
+    return ret;
+}
+
+QQuickItem *QQuickDataTest::tableViewItemAtCell(QQuickItem *table, int col, int row)
+{
+    static const QMetaMethod itemAtCellMethod = table->metaObject()->method(
+                table->metaObject()->indexOfMethod("itemAtCell(int,int)"));
+    QQuickItem *ret = nullptr;
+    itemAtCellMethod.invoke(table, Qt::DirectConnection,
+                            Q_RETURN_ARG(QQuickItem*, ret), Q_ARG(int, col), Q_ARG(int, row));
+    return ret;
+}
+
+QPoint QQuickDataTest::tableViewContentPos(QQuickItem *table)
+{
+    return QPoint(table->property("contentX").toInt(), table->property("contentY").toInt());
+}
diff --git a/tests/auto/pdfquick/shared/util.h b/tests/auto/pdfquick/shared/util.h
new file mode 100644
index 000000000..9ceb711af
--- /dev/null
+++ b/tests/auto/pdfquick/shared/util.h
@@ -0,0 +1,58 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QUICK_VISUAL_TEST_UTIL_H
+#define QUICK_VISUAL_TEST_UTIL_H
+
+#include <QtCore/QUrl>
+#include <QtQuick/QQuickView>
+#include <QtTest/QTest>
+
+/*! \internal
+    Base class for tests with data that are located in a "data" subfolder.
+*/
+class QQuickDataTest : public QObject
+{
+    Q_OBJECT
+public:
+    QQuickDataTest();
+    ~QQuickDataTest();
+
+    bool initialized() const { return m_initialized; }
+
+    bool showView(QQuickView &view, const QUrl &url);
+
+    QString testFile(const QString &fileName) const;
+    inline QString testFile(const char *fileName) const
+        { return testFile(QLatin1String(fileName)); }
+    inline QUrl testFileUrl(const QString &fileName) const
+        {
+            const QString fn = testFile(fileName);
+            return fn.startsWith(QLatin1Char(':'))
+                ? QUrl(QLatin1String("qrc") + fn)
+                : QUrl::fromLocalFile(fn);
+        }
+    inline QUrl testFileUrl(const char *fileName) const
+        { return testFileUrl(QLatin1String(fileName)); }
+
+    inline QString dataDirectory() const { return m_dataDirectory; }
+    inline QUrl dataDirectoryUrl() const { return m_dataDirectoryUrl; }
+    inline QString directory() const  { return m_directory; }
+
+    QObject *findFirstChild(QObject *parent, const char *className);
+    QQuickItem *repeaterItemAt(QQuickItem *repeater, int i);
+    QQuickItem *tableViewItemAtCell(QQuickItem *table, int col, int row);
+    QPoint tableViewContentPos(QQuickItem *table);
+
+public slots:
+    virtual void initTestCase();
+    virtual void cleanupTestCase();
+
+private:
+    bool m_initialized;
+    QString m_dataDirectory;
+    QUrl m_dataDirectoryUrl;
+    QString m_directory;
+};
+
+#endif
-- 
cgit v1.2.3


From ce5a166f0af096681e02ece1156a1f5433b57167 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Tue, 30 Aug 2022 21:09:19 +0200
Subject: Blacklist tst_MultiPageView::password on Windows

Task-number: QTBUG-106072
Change-Id: Iecc763f0f8cd5f1b83588a31f1de4fd4f8c0055e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 1f7ced8bc0d3c4156648b99b360580b5420acbdc)
---
 tests/auto/pdfquick/multipageview/BLACKLIST | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tests/auto/pdfquick/multipageview/BLACKLIST

(limited to 'tests')

diff --git a/tests/auto/pdfquick/multipageview/BLACKLIST b/tests/auto/pdfquick/multipageview/BLACKLIST
new file mode 100644
index 000000000..b608bef1c
--- /dev/null
+++ b/tests/auto/pdfquick/multipageview/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-106072
+[password]
+windows
-- 
cgit v1.2.3


From 76cf8c4b4d1737d3f658497976d1a18ab5ee7535 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Fri, 17 Apr 2020 23:23:43 +0200
Subject: Add tst_MultiPageView::navigation() test

The navigation() test is a high-level one to verify that the navigation
stack works and that the TableView jumps to the expected locations
inside the document when we go to pages, click links and use the
forward() and back() methods. It's similar to the internalLink()
test, but more programmable.

Change-Id: I337e2ae283213238288a172d1bab3df07a1395e0
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 2d8c8ac02e8afed8d99996e3d53cacd982badfeb)
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 .../data/multiPageViewWithFeedback.qml             |  18 ++++
 .../pdfquick/multipageview/data/qpdfwriter.pdf     | Bin 0 -> 33645 bytes
 .../pdfquick/multipageview/tst_multipageview.cpp   | 120 +++++++++++++++++++++
 3 files changed, 138 insertions(+)
 create mode 100644 tests/auto/pdfquick/multipageview/data/multiPageViewWithFeedback.qml
 create mode 100644 tests/auto/pdfquick/multipageview/data/qpdfwriter.pdf

(limited to 'tests')

diff --git a/tests/auto/pdfquick/multipageview/data/multiPageViewWithFeedback.qml b/tests/auto/pdfquick/multipageview/data/multiPageViewWithFeedback.qml
new file mode 100644
index 000000000..93a556c97
--- /dev/null
+++ b/tests/auto/pdfquick/multipageview/data/multiPageViewWithFeedback.qml
@@ -0,0 +1,18 @@
+import QtQuick
+import QtQuick.Pdf
+
+PdfMultiPageView {
+    id: view
+    property point hoverPos: hover.point.position
+    width: 640; height: 480
+    document: PdfDocument { }
+
+    // mouse hover feedback for test development
+    Rectangle {
+        width: 200
+        height: hoverPosLabel.implicitHeight + 12
+        color: "beige"
+        Text { id: hoverPosLabel; x: 6; y: 6; text: view.hoverPos.x + ", " + view.hoverPos.y }
+    }
+    HoverHandler { id: hover }
+}
diff --git a/tests/auto/pdfquick/multipageview/data/qpdfwriter.pdf b/tests/auto/pdfquick/multipageview/data/qpdfwriter.pdf
new file mode 100644
index 000000000..4abc76f6d
Binary files /dev/null and b/tests/auto/pdfquick/multipageview/data/qpdfwriter.pdf differ
diff --git a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
index fd58c7e24..eb70ebf17 100644
--- a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
+++ b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
@@ -21,10 +21,31 @@ class tst_MultiPageView : public QQuickDataTest
 private Q_SLOTS:
     void internalLink_data();
     void internalLink();
+    void navigation_data();
+    void navigation();
     void password();
     void selectionAndClipboard();
     void search();
 
+public:
+    enum NavigationAction {
+        Back,
+        Forward,
+        GotoPage,
+        GotoLocation,
+        ClickLink
+    };
+    Q_ENUM(NavigationAction)
+
+    struct NavigationCommand {
+        NavigationAction action;
+        int index;
+        QPointF location;
+        qreal zoom;
+        QPointF expectedContentPos;
+        int expectedCurrentPage;
+    };
+
 private:
     QScopedPointer<QPointingDevice> touchscreen = QScopedPointer<QPointingDevice>(QTest::createTouchDevice());
 };
@@ -111,6 +132,105 @@ void tst_MultiPageView::internalLink()
     QCOMPARE(pdfView->property("renderScale").toReal(), linkZoom);
 }
 
+void tst_MultiPageView::navigation_data()
+{
+    QTest::addColumn<QList<NavigationCommand>>("actions");
+    const int totalPageSpacing = 832; // 826 points + 6 px (rowSpacing)
+
+    QList<NavigationCommand> actions;
+    actions << NavigationCommand {NavigationAction::GotoPage, 2, {}, 0, {0, 1664}, 2}
+            << NavigationCommand {NavigationAction::GotoPage, 3, {}, 0, {0, 2496}, 3}
+            << NavigationCommand {NavigationAction::Back, 0, {}, 0, {0, 1664}, 2}
+            << NavigationCommand {NavigationAction::Back, 0, {}, 0, {0, 0}, 0};
+    QTest::newRow("goto and back") << actions;
+
+    actions.clear();
+    actions // first link is "More..." going to page 0, location 8, 740
+            << NavigationCommand {NavigationAction::ClickLink, 0, {465, 65}, 0, {0, 740}, 0}
+            << NavigationCommand {NavigationAction::Back, 0, {}, 0, {0, 0}, 0}
+            // link "setPdfVersion()" going to page 3, location 8, 295
+            << NavigationCommand {NavigationAction::ClickLink, 0, {255, 455}, 0, {0, totalPageSpacing * 3 + 295}, 3}
+            << NavigationCommand {NavigationAction::Back, 0, {}, 0, {0, 0}, 0};
+    QTest::newRow("click links and go back, twice") << actions;
+
+    actions.clear();
+    actions // first link is "More..." going to page 0, location 8, 740
+            << NavigationCommand {NavigationAction::ClickLink, 0, {465, 65}, 0, {0, 740}, 0}
+               // link "newPage()" going to page 1, location 8, 290
+            << NavigationCommand {NavigationAction::ClickLink, 0, {480, 40}, 0, {0, totalPageSpacing + 290}, 1} // fails, goes back to page 0
+            << NavigationCommand {NavigationAction::Back, 0, {}, 0, {8, 740}, 0}
+            << NavigationCommand {NavigationAction::Back, 0, {}, 0, {0, 0}, 0};
+    QTest::newRow("click two links in series and then go back") << actions;
+}
+
+void tst_MultiPageView::navigation()
+{
+    QFETCH(QList<NavigationCommand>, actions);
+
+    QQuickView window;
+    window.setColor(Qt::gray);
+    window.setSource(testFileUrl("multiPageViewWithFeedback.qml"));
+    QTRY_COMPARE(window.status(), QQuickView::Ready);
+    QQuickItem *pdfView = window.rootObject();
+    QVERIFY(pdfView);
+    QObject *doc = pdfView->property("document").value<QObject *>();
+    QVERIFY(doc);
+    doc->setProperty("source", testFileUrl("qpdfwriter.pdf"));
+    QQuickItem *table = static_cast<QQuickItem *>(findFirstChild(pdfView, "QQuickTableView"));
+    QVERIFY(table);
+    // Expect that contentY == destination y after a jump, for ease of comparison.
+    // 0.01 is close enough to 0 that we can compare int positions accurately,
+    // but nonzero so that QRectF::isValid() is true in tableView.positionViewAtCell()
+    table->setProperty("jumpLocationMargin", QPointF(0.01, 0.01));
+
+    window.show();
+    window.requestActivate();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+
+    QTRY_COMPARE(table->property("contentHeight").toInt(), 3322);
+    QCOMPARE(table->property("contentY").toInt(), 0);
+
+    for (const NavigationCommand &nav : actions) {
+        switch (nav.action) {
+        case NavigationAction::Back:
+            QVERIFY(QMetaObject::invokeMethod(pdfView, "back"));
+            QCOMPARE(pdfView->property("forwardEnabled").toBool(), true);
+            break;
+        case NavigationAction::Forward:
+            QVERIFY(QMetaObject::invokeMethod(pdfView, "forward"));
+            QCOMPARE(pdfView->property("backEnabled").toBool(), true);
+            break;
+        case NavigationAction::GotoPage:
+            QVERIFY(QMetaObject::invokeMethod(pdfView, "goToPage",
+                                              Q_ARG(QVariant, QVariant(nav.index))));
+            QCOMPARE(pdfView->property("backEnabled").toBool(), true);
+            break;
+        case NavigationAction::GotoLocation:
+            QVERIFY(QMetaObject::invokeMethod(pdfView, "goToLocation",
+                                              Q_ARG(QVariant, QVariant(nav.index)),
+                                              Q_ARG(QVariant, QVariant(nav.location)),
+                                              Q_ARG(QVariant, QVariant(nav.zoom)) ));
+            break;
+        case NavigationAction::ClickLink:
+            // Link delegates don't exist until page rendering is done
+            QTRY_VERIFY(pdfView->property("currentPageRenderingStatus").toInt() == 1); // QQuickImage::Status::Ready
+            QTest::mouseClick(&window, Qt::LeftButton, Qt::NoModifier, nav.location.toPoint());
+            // Wait for the destination page to be rendered
+            QTRY_VERIFY(pdfView->property("currentPageRenderingStatus").toInt() == 1); // QQuickImage::Status::Ready
+            break;
+        }
+        qCDebug(lcTests) << "action" << nav.action << "index" << nav.index
+                         << "contentX,Y" << table->property("contentX").toInt() << table->property("contentY").toInt()
+                         << "expected" << nav.expectedContentPos;
+        QTRY_COMPARE(table->property("contentY").toInt(), nav.expectedContentPos.y());
+        // some minor side-to-side scrolling happens, in practice
+        QVERIFY(qAbs(table->property("contentX").toInt() - nav.expectedContentPos.x()) < 10);
+        QCOMPARE(pdfView->property("currentPage").toInt(), nav.expectedCurrentPage);
+    }
+
+    QCOMPARE(pdfView->property("backEnabled").toBool(), false);
+}
+
 void tst_MultiPageView::password()
 {
     QQuickView window;
-- 
cgit v1.2.3


From 7ed5ae908473c60417889f09aa20594878c22354 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 2 Sep 2022 12:07:35 +0200
Subject: Improve tests for qemu-armv7

test_runJavaScript() was badly written with a hardcoded wait of 100ms
this should make it both faster on normal machines and more reliable
on slower ones.

Fixes: QTBUG-106210
Change-Id: I539e59dce6e3719661202e1a213277794a660bd3
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit f38f75bf8310186085c3be7a9f5816115f5c74c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 2 +-
 tests/auto/quick/qmltests/data/tst_runJavaScript.qml     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 0a0d3ee0f..58e8f7d11 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -136,7 +136,7 @@ void tst_InspectorServer::testRemoteDebuggingMessage()
         .arg(pageList.at(0).toObject().value("webSocketDebuggerUrl").toString())
         .arg(jsExpression));
 
-    QTRY_COMPARE(webSocketQueryWebView->title(), jsExpressionResult);
+    QTRY_COMPARE_WITH_TIMEOUT(webSocketQueryWebView->title(), jsExpressionResult, 10000);
 }
 
 void tst_InspectorServer::openRemoteDebuggingSession()
diff --git a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml
index 22e427ad4..f16cd9c41 100644
--- a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml
+++ b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml
@@ -34,8 +34,7 @@ TestWebEngineView {
                     compare(result, testTitle2);
                     callbackCalled = true;
                 });
-            wait(100);
-            verify(callbackCalled);
+            tryVerify(function() { return callbackCalled; });
         }
     }
 }
-- 
cgit v1.2.3


From d72c6f2c65e3111a841cbc6cfdd1c1e005f56458 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 9 Sep 2022 12:23:08 +0200
Subject: Fix using QNetworkReply with custom url schemes

Sequential QIODevices are allowed to report atEnd() when they have no
data to read, but add more data later.

To avoid a regression with our own tests, treat a read error from a
sequential device at end, as end-of-data.

Fixes: QTBUG-106461
Change-Id: Iac1233e6daa978c827c37a7fd3131e2fce764111
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit aefd389bfdf7efcaf787d2cfb4683d7018cb377c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qwebengineprofile/tst_qwebengineprofile.cpp    | 59 +++++++++++++++++++---
 1 file changed, 52 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index c09f3b51a..ee4f5990e 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -66,6 +66,7 @@ private Q_SLOTS:
     void urlSchemeHandlerFailRequest();
     void urlSchemeHandlerFailOnRead();
     void urlSchemeHandlerStreaming();
+    void urlSchemeHandlerStreaming2();
     void urlSchemeHandlerRequestHeaders();
     void urlSchemeHandlerInstallation();
     void urlSchemeHandlerXhrStatus();
@@ -289,10 +290,12 @@ public:
     QList<QPointer<QBuffer>> m_buffers;
 };
 
-class StreamingIODevice : public QIODevice {
+// an evil version constantly claiming to be at end, similar to QNetworkReply
+class StreamingIODeviceBasic : public QIODevice
+{
     Q_OBJECT
 public:
-    StreamingIODevice(QObject *parent) : QIODevice(parent), m_bytesRead(0), m_bytesAvailable(0)
+    StreamingIODeviceBasic(QObject *parent) : QIODevice(parent), m_bytesRead(0), m_bytesAvailable(0)
     {
         setOpenMode(QIODevice::ReadOnly);
         m_timer.start(100, this);
@@ -303,12 +306,11 @@ public:
         const std::lock_guard<QRecursiveMutex> lock(m_mutex);
         return m_bytesAvailable;
     }
-    bool atEnd() const override
+protected:
+    bool internalAtEnd() const
     {
-        const std::lock_guard<QRecursiveMutex> lock(m_mutex);
         return (m_data.size() >= 1000 && m_bytesRead >= 1000);
     }
-protected:
     void timerEvent(QTimerEvent *) override
     {
         const std::lock_guard<QRecursiveMutex> lock(m_mutex);
@@ -329,7 +331,7 @@ protected:
             memcpy(data, m_data.constData() + m_bytesRead, len);
             m_bytesAvailable -= len;
             m_bytesRead += len;
-        } else if (atEnd())
+        } else if (internalAtEnd())
             return -1;
 
         return len;
@@ -339,14 +341,26 @@ protected:
         return 0;
     }
 
-private:
     mutable QRecursiveMutex m_mutex;
+private:
     QByteArray m_data;
     QBasicTimer m_timer;
     int m_bytesRead;
     int m_bytesAvailable;
 };
 
+// A nicer version implementing atEnd
+class StreamingIODevice : public StreamingIODeviceBasic
+{
+public:
+    StreamingIODevice(QObject *parent) : StreamingIODeviceBasic(parent) {}
+    bool atEnd() const override
+    {
+        const std::lock_guard<QRecursiveMutex> lock(m_mutex);
+        return internalAtEnd();
+    }
+};
+
 class StreamingUrlSchemeHandler : public QWebEngineUrlSchemeHandler
 {
 public:
@@ -361,6 +375,20 @@ public:
     }
 };
 
+class StreamingUrlSchemeHandler2 : public QWebEngineUrlSchemeHandler
+{
+public:
+    StreamingUrlSchemeHandler2(QObject *parent = nullptr)
+        : QWebEngineUrlSchemeHandler(parent)
+    {
+    }
+
+    void requestStarted(QWebEngineUrlRequestJob *job) override
+    {
+        job->reply("text/plain;charset=utf-8", new StreamingIODeviceBasic(job));
+    }
+};
+
 void tst_QWebEngineProfile::urlSchemeHandlers()
 {
     RedirectingUrlSchemeHandler lettertoHandler;
@@ -502,6 +530,23 @@ void tst_QWebEngineProfile::urlSchemeHandlerStreaming()
     QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
 }
 
+void tst_QWebEngineProfile::urlSchemeHandlerStreaming2()
+{
+    StreamingUrlSchemeHandler2 handler;
+    QWebEngineProfile profile;
+    profile.installUrlSchemeHandler("stream", &handler);
+    QWebEngineView view;
+    QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
+    view.setPage(new QWebEnginePage(&profile, &view));
+    view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
+    view.load(QUrl(QStringLiteral("stream://whatever")));
+    view.show();
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QByteArray result;
+    result.append(1000, 'c');
+    QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
+}
+
 class ExtraHeaderInterceptor : public QWebEngineUrlRequestInterceptor
 {
 public:
-- 
cgit v1.2.3


From e0c0f791a10d73b53c4790a20b41f254331903c0 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 9 Sep 2022 12:23:08 +0200
Subject: Fix using QNetworkReply with custom url schemes

Sequential QIODevices are allowed to report atEnd() when they have no
data to read, but add more data later.

To avoid a regression with our own tests, treat a read error from a
sequential device at end, as end-of-data.

Fixes: QTBUG-106461
Change-Id: Iac1233e6daa978c827c37a7fd3131e2fce764111
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit aefd389bfdf7efcaf787d2cfb4683d7018cb377c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qwebengineprofile/tst_qwebengineprofile.cpp    | 59 +++++++++++++++++++---
 1 file changed, 52 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 73b50897d..35c66e9ed 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -41,6 +41,7 @@ private Q_SLOTS:
     void urlSchemeHandlerFailRequest();
     void urlSchemeHandlerFailOnRead();
     void urlSchemeHandlerStreaming();
+    void urlSchemeHandlerStreaming2();
     void urlSchemeHandlerRequestHeaders();
     void urlSchemeHandlerInstallation();
     void urlSchemeHandlerXhrStatus();
@@ -264,10 +265,12 @@ public:
     QList<QPointer<QBuffer>> m_buffers;
 };
 
-class StreamingIODevice : public QIODevice {
+// an evil version constantly claiming to be at end, similar to QNetworkReply
+class StreamingIODeviceBasic : public QIODevice
+{
     Q_OBJECT
 public:
-    StreamingIODevice(QObject *parent) : QIODevice(parent), m_bytesRead(0), m_bytesAvailable(0)
+    StreamingIODeviceBasic(QObject *parent) : QIODevice(parent), m_bytesRead(0), m_bytesAvailable(0)
     {
         setOpenMode(QIODevice::ReadOnly);
         m_timer.start(100, this);
@@ -278,12 +281,11 @@ public:
         const std::lock_guard<QRecursiveMutex> lock(m_mutex);
         return m_bytesAvailable;
     }
-    bool atEnd() const override
+protected:
+    bool internalAtEnd() const
     {
-        const std::lock_guard<QRecursiveMutex> lock(m_mutex);
         return (m_data.size() >= 1000 && m_bytesRead >= 1000);
     }
-protected:
     void timerEvent(QTimerEvent *) override
     {
         const std::lock_guard<QRecursiveMutex> lock(m_mutex);
@@ -304,7 +306,7 @@ protected:
             memcpy(data, m_data.constData() + m_bytesRead, len);
             m_bytesAvailable -= len;
             m_bytesRead += len;
-        } else if (atEnd())
+        } else if (internalAtEnd())
             return -1;
 
         return len;
@@ -314,14 +316,26 @@ protected:
         return 0;
     }
 
-private:
     mutable QRecursiveMutex m_mutex;
+private:
     QByteArray m_data;
     QBasicTimer m_timer;
     int m_bytesRead;
     int m_bytesAvailable;
 };
 
+// A nicer version implementing atEnd
+class StreamingIODevice : public StreamingIODeviceBasic
+{
+public:
+    StreamingIODevice(QObject *parent) : StreamingIODeviceBasic(parent) {}
+    bool atEnd() const override
+    {
+        const std::lock_guard<QRecursiveMutex> lock(m_mutex);
+        return internalAtEnd();
+    }
+};
+
 class StreamingUrlSchemeHandler : public QWebEngineUrlSchemeHandler
 {
 public:
@@ -336,6 +350,20 @@ public:
     }
 };
 
+class StreamingUrlSchemeHandler2 : public QWebEngineUrlSchemeHandler
+{
+public:
+    StreamingUrlSchemeHandler2(QObject *parent = nullptr)
+        : QWebEngineUrlSchemeHandler(parent)
+    {
+    }
+
+    void requestStarted(QWebEngineUrlRequestJob *job) override
+    {
+        job->reply("text/plain;charset=utf-8", new StreamingIODeviceBasic(job));
+    }
+};
+
 void tst_QWebEngineProfile::urlSchemeHandlers()
 {
     RedirectingUrlSchemeHandler lettertoHandler;
@@ -477,6 +505,23 @@ void tst_QWebEngineProfile::urlSchemeHandlerStreaming()
     QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
 }
 
+void tst_QWebEngineProfile::urlSchemeHandlerStreaming2()
+{
+    StreamingUrlSchemeHandler2 handler;
+    QWebEngineProfile profile;
+    profile.installUrlSchemeHandler("stream", &handler);
+    QWebEngineView view;
+    QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
+    view.setPage(new QWebEnginePage(&profile, &view));
+    view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
+    view.load(QUrl(QStringLiteral("stream://whatever")));
+    view.show();
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QByteArray result;
+    result.append(1000, 'c');
+    QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
+}
+
 class ExtraHeaderInterceptor : public QWebEngineUrlRequestInterceptor
 {
 public:
-- 
cgit v1.2.3


From 6663dd1ac0f0ba0598315cfe75920c74f7c08454 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 24 Aug 2022 09:21:03 +0200
Subject: Fix locally falling tst_qpdfdocument on qemu

Use name for temporary file otherwise is can not be
opened on qemu.

Task-number: QTBUG-105342
Change-Id: I7f9ed244c32b866ead6832ed942e2293be24811b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 30f2d86426c674d0cba9ca88dbf7e587c57e72d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
index a481ee57c..975708f65 100644
--- a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
+++ b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
@@ -54,7 +54,7 @@ struct TemporaryPdf: public QTemporaryFile
 };
 
 
-TemporaryPdf::TemporaryPdf()
+TemporaryPdf::TemporaryPdf():QTemporaryFile(QStringLiteral("qpdfdocument"))
 {
     open();
     pageLayout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF());
-- 
cgit v1.2.3


From 9fb8c7fe2c6e0cfb22d4c46c599d1e85694dc701 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Wed, 5 Oct 2022 13:09:39 +0200
Subject: Stop using deprecated QMouseEvent constructor

Followup to qtbase 6b2c9b81afdb3d1d9b7a2e87819e9545b14810f3

Change-Id: Ib879ee176c4fd1fc4bdbac7161ea20cf5c59a247
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 252456b94a93ddef2fdfdd49d59fc8f474fb5e80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index ed1c1cae6..33c6f872c 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3224,13 +3224,16 @@ void tst_QWebEnginePage::mouseButtonTranslation()
 
     QVERIFY(view.focusProxy() != nullptr);
 
-    QMouseEvent evpres(QEvent::MouseButtonPress, view.rect().center(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+    const QPoint mousePos = view.rect().center();
+    QMouseEvent evpres(QEvent::MouseButtonPress, mousePos, view.mapToGlobal(mousePos),
+                       Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
     QGuiApplication::sendEvent(view.focusProxy(), &evpres);
 
     QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "lastEvent.button").toInt(), 0);
     QCOMPARE(evaluateJavaScriptSync(view.page(), "lastEvent.buttons").toInt(), 1);
 
-    QMouseEvent evpres2(QEvent::MouseButtonPress, view.rect().center(), Qt::RightButton, Qt::LeftButton | Qt::RightButton, Qt::NoModifier);
+    QMouseEvent evpres2(QEvent::MouseButtonPress, mousePos, view.mapToGlobal(mousePos),
+                        Qt::RightButton, Qt::LeftButton | Qt::RightButton, Qt::NoModifier);
     QGuiApplication::sendEvent(view.focusProxy(), &evpres2);
 
     QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "lastEvent.button").toInt(), 2);
-- 
cgit v1.2.3


From fe766a1e82156a4281b797e62c915764a963e332 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 11 Oct 2022 12:34:58 +0200
Subject: Fix GCC compiler warnings in auto tests

Change-Id: I9daae92749e7dbe0580c17e8f0325e2199b2ed17
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit cd82a30311302ded70b278bfc4919097b0f421f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../tst_qwebenginedownloadrequest.cpp                          |  9 ++++++---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp       | 10 +++++-----
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp       |  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
index 4e9a9fecd..5e4865003 100644
--- a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
+++ b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
@@ -128,9 +128,12 @@ void tst_QWebEngineDownloadRequest::saveLink(QPoint linkPos)
     // Simulate right-clicking on link and choosing "save link as" from menu.
     QSignalSpy menuSpy(m_view, &QWebEngineView::customContextMenuRequested);
     m_view->setContextMenuPolicy(Qt::CustomContextMenu);
-    auto event1 = new QContextMenuEvent(QContextMenuEvent::Mouse, linkPos);
-    auto event2 = new QMouseEvent(QEvent::MouseButtonPress, linkPos, Qt::RightButton, {}, {});
-    auto event3 = new QMouseEvent(QEvent::MouseButtonRelease, linkPos, Qt::RightButton, {}, {});
+    auto event1 =
+            new QContextMenuEvent(QContextMenuEvent::Mouse, linkPos, m_view->mapToGlobal(linkPos));
+    auto event2 = new QMouseEvent(QEvent::MouseButtonPress, linkPos, m_view->mapToGlobal(linkPos),
+                                  Qt::RightButton, {}, {});
+    auto event3 = new QMouseEvent(QEvent::MouseButtonRelease, linkPos, m_view->mapToGlobal(linkPos),
+                                  Qt::RightButton, {}, {});
     QTRY_VERIFY(m_view->focusWidget());
     QWidget *renderWidget = m_view->focusWidget();
     QCoreApplication::postEvent(renderWidget, event1);
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 33c6f872c..853297ff0 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1360,7 +1360,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     auto pos = elementCenter(view.page(), "foo");
     makeClick(window, withTouch, pos);
     QWindow *popup = nullptr;
-    QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QTRY_VERIFY((popup = findNewTopLevelWindow(oldTlws)));
     QVERIFY(QTest::qWaitForWindowExposed(popup));
     QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
@@ -1388,7 +1388,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     view.move(view.pos() + offset);
     QTRY_COMPARE(jsViewPosition(), view.pos());
     makeClick(window, withTouch, elementCenter(view.page(), "foo"));
-    QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QTRY_VERIFY((popup = findNewTopLevelWindow(oldTlws)));
     QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
     QTRY_VERIFY(!popup->position().isNull());
@@ -1433,7 +1433,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     makeClick(window, withTouch, view.mapTo(view.window(), elementCenter(view.page(), "foo")));
 
     QWindow *popup = nullptr;
-    QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QTRY_VERIFY((popup = findNewTopLevelWindow(oldTlws)));
     QVERIFY(QTest::qWaitForWindowExposed(popup));
     QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(QGuiApplication::topLevelWindows().contains(popup));
@@ -1460,7 +1460,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     QTRY_COMPARE(jsViewWidth(), originalViewWidth - offset);
 
     makeClick(window, withTouch, view.mapTo(view.window(), elementCenter(view.page(), "foo")));
-    QTRY_VERIFY(popup = findNewTopLevelWindow(oldTlws));
+    QTRY_VERIFY((popup = findNewTopLevelWindow(oldTlws)));
     QVERIFY(QTest::qWaitForWindowExposed(popup));
     QTRY_VERIFY(popup->width() > 0 && popup->height() > 0);
     QTRY_VERIFY(!popup->position().isNull());
@@ -3682,7 +3682,7 @@ void tst_QWebEnginePage::openLinkInNewPage()
         break;
     }
 
-    Qt::MouseButton button;
+    Qt::MouseButton button = Qt::NoButton;
     switch (cause) {
     case Cause::TargetBlank:
         button = Qt::LeftButton;
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 7cfe072b3..bd49db7d2 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -72,7 +72,8 @@ namespace QTest {
     {
         QTest::qWait(QTest::defaultMouseDelay());
         lastMouseTimestamp += QTest::defaultMouseDelay();
-        QMouseEvent me(type, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+        QMouseEvent me(type, pos, widget->mapToGlobal(pos), Qt::LeftButton, Qt::LeftButton,
+                       Qt::NoModifier);
         me.setTimestamp(++lastMouseTimestamp);
         QSpontaneKeyEvent::setSpontaneous(&me);
         qApp->sendEvent(widget, &me);
-- 
cgit v1.2.3


From facfb09d4dd687439d0f001ad80f272782c80123 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 31 Oct 2022 11:32:33 +0100
Subject: Blacklist certificate test and unblock integrations

Certificate for revoked.badssl.com expired on 10/28/2022.

Change-Id: I06022bea1404bf5134f815067dcd2713790e5a23
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 23841d844adf252061f949b1b810049e82ec2aef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/core/certificateerror/BLACKLIST | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/auto/core/certificateerror/BLACKLIST

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/BLACKLIST b/tests/auto/core/certificateerror/BLACKLIST
new file mode 100644
index 000000000..a8fd16bf3
--- /dev/null
+++ b/tests/auto/core/certificateerror/BLACKLIST
@@ -0,0 +1,2 @@
+[fatalError]
+*
-- 
cgit v1.2.3


From 54017760b77fb8359d4ef51c82668acbfd4e86e2 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 1 Nov 2022 22:43:34 +0100
Subject: Use QSslServer in certificate test

We had our own implementation for the HTTPS server.
However, the way it worked involved adding for every
incoming connection a socket to the list of pending
connections, which resulted in unnecessary logging noise
due to socket connect/disconnected signals during
the SSL handshake negotiations. It also resulted in
memory leaks.

Since 6.4 we have now QSslServer which adds socket to the
pending connection list only after encryption got established.

Change-Id: I3c8a2a0684e3f0760a56d4b4aaf7b777700e334b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 4d0a8a6030728bcf63b654ecee2de2fec3575b77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../core/certificateerror/tst_certificateerror.cpp |  3 +-
 tests/auto/httpserver/httpserver.cpp               |  3 +-
 tests/auto/httpserver/httpsserver.h                | 62 ++++++++++------------
 3 files changed, 31 insertions(+), 37 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 4ae840e72..6afd7d816 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -68,7 +68,7 @@ void tst_CertificateError::handleError_data()
 void tst_CertificateError::handleError()
 {
     HttpsServer server(":/resources/server.pem",":/resources/server.key");
-    server.setExpectError(true);
+    server.setExpectError(false);
     QVERIFY(server.start());
 
     connect(&server, &HttpsServer::newRequest, [&] (HttpReqRep *rr) {
@@ -105,6 +105,7 @@ void tst_CertificateError::handleError()
     QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.count(), 1, 30000);
     QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate);
     QCOMPARE(toPlainTextSync(&page), expectedContent);
+    QVERIFY(server.stop());
 }
 
 void tst_CertificateError::fatalError()
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index 6dd64ab88..30320950a 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -24,7 +24,8 @@ HttpServer::HttpServer(QTcpServer *tcpServer, const QString &protocol,
 {
     m_url.setHost(hostAddress.toString());
     m_url.setScheme(protocol);
-    connect(tcpServer, &QTcpServer::newConnection, this, &HttpServer::handleNewConnection);
+    connect(tcpServer, &QTcpServer::pendingConnectionAvailable, this,
+            &HttpServer::handleNewConnection);
 }
 
 HttpServer::~HttpServer()
diff --git a/tests/auto/httpserver/httpsserver.h b/tests/auto/httpserver/httpsserver.h
index d064c1416..2982ed8c4 100644
--- a/tests/auto/httpserver/httpsserver.h
+++ b/tests/auto/httpserver/httpsserver.h
@@ -7,52 +7,44 @@
 #include "httpserver.h"
 
 #include <QDebug>
-#include <QFile>
-#include <QSslKey>
-#include <QSslSocket>
-#include <QSslConfiguration>
-#include <QTcpServer>
+#include <QtCore/qfile.h>
+#include <QtNetwork/qsslkey.h>
+#include <QtNetwork/qsslsocket.h>
+#include <QtNetwork/qsslconfiguration.h>
+#include <QtNetwork/qsslserver.h>
 
-struct SslTcpServer : QTcpServer
+static QSslServer *createServer(const QString &certificateFileName, const QString &keyFileName)
 {
-    SslTcpServer(const QString &certPath, const QString &keyPath) {
-        sslconf.setLocalCertificateChain(QSslCertificate::fromPath(certPath));
-        sslconf.setPrivateKey(readKey(keyPath));
-    }
-
-    void incomingConnection(qintptr d) override {
-        auto socket = new QSslSocket(this);
-        socket->setSslConfiguration(sslconf);
-
-        if (!socket->setSocketDescriptor(d)) {
-            qWarning() << "Failed to setup ssl socket!";
-            delete socket;
-            return;
+    QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
+
+    QFile keyFile(keyFileName);
+    if (keyFile.open(QIODevice::ReadOnly)) {
+        QSslKey key(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
+        if (!key.isNull()) {
+            configuration.setPrivateKey(key);
+        } else {
+            qCritical() << "Could not parse key: " << keyFileName;
         }
-
-        connect(socket, QOverload<QSslSocket::SocketError>::of(&QSslSocket::errorOccurred),
-                [] (QSslSocket::SocketError e) { qWarning() << "! Socket Error:" << e; });
-        connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors),
-                [] (const QList<QSslError> &le) { qWarning() << "! SSL Errors:\n" << le; });
-
-        addPendingConnection(socket);
-        socket->startServerEncryption();
+    } else {
+        qCritical() << "Could not find key: " << keyFileName;
     }
 
-    QSslKey readKey(const QString &path) const {
-        QFile file(path);
-        file.open(QIODevice::ReadOnly);
-        return QSslKey(file.readAll(), QSsl::Rsa, QSsl::Pem);
+    QList<QSslCertificate> localCerts = QSslCertificate::fromPath(certificateFileName);
+    if (!localCerts.isEmpty()) {
+        configuration.setLocalCertificateChain(localCerts);
+    } else {
+        qCritical() << "Could not find certificate: " << certificateFileName;
     }
 
-    QSslConfiguration sslconf;
-};
+    QSslServer *server = new QSslServer();
+    server->setSslConfiguration(configuration);
+    return server;
+}
 
 struct HttpsServer : HttpServer
 {
     HttpsServer(const QString &certPath, const QString &keyPath, QObject *parent = nullptr)
-        : HttpServer(new SslTcpServer(certPath, keyPath), "https", QHostAddress::LocalHost, 0,
-                     parent)
+        : HttpServer(createServer(certPath, keyPath), "https", QHostAddress::LocalHost, 0, parent)
     {
     }
 };
-- 
cgit v1.2.3


From 6403c98ca1e4ef713fbf0b4972b1eab44c288ca1 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 11 Nov 2022 15:53:00 +0100
Subject: Port from container::count() and length() to size() - V5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a the same semantic patch (qt-port-to-std-compatible-api V5
with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to
avoid cherry-pick conflicts.

Change-Id: I9621dee5ed328b47e78919a34c307105e4311903
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 .../core/certificateerror/tst_certificateerror.cpp |   4 +-
 tests/auto/core/devtools/tst_devtools.cpp          |   4 +-
 tests/auto/core/origins/tst_origins.cpp            |   2 +-
 .../tst_qwebengineclientcertificatestore.cpp       |   8 +-
 .../tst_qwebenginecookiestore.cpp                  |  78 +--
 .../qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp    |  12 +-
 tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp   |  60 +--
 .../pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp  |  10 +-
 .../pdfquick/multipageview/tst_multipageview.cpp   |  32 +-
 tests/auto/quick/dialogs/tst_dialogs.cpp           |   8 +-
 tests/auto/quick/qmltests/tst_qmltests.cpp         |   2 +-
 .../tst_qquickwebengineview.cpp                    |  30 +-
 tests/auto/util/quickutil.h                        |   2 +-
 tests/auto/util/util.h                             |   4 +-
 .../widgets/accessibility/tst_accessibility.cpp    |   2 +-
 tests/auto/widgets/favicon/tst_favicon.cpp         | 200 +++----
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp |  18 +-
 tests/auto/widgets/offscreen/tst_offscreen.cpp     |   2 +-
 tests/auto/widgets/printing/tst_printing.cpp       |  18 +-
 tests/auto/widgets/proxy/tst_proxy.cpp             |   4 +-
 tests/auto/widgets/proxypac/tst_proxypac.cpp       |   6 +-
 .../tst_qwebenginedownloadrequest.cpp              |  34 +-
 .../qwebenginehistory/tst_qwebenginehistory.cpp    |  40 +-
 .../widgets/qwebenginepage/tst_qwebenginepage.cpp  | 572 ++++++++++-----------
 .../qwebengineprofile/tst_qwebengineprofile.cpp    |  42 +-
 .../qwebenginescript/tst_qwebenginescript.cpp      |  28 +-
 .../widgets/qwebengineview/tst_qwebengineview.cpp  | 238 ++++-----
 .../widgets/spellchecking/tst_spellchecking.cpp    |   2 +-
 28 files changed, 731 insertions(+), 731 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 6afd7d816..9ad2c03ee 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -92,7 +92,7 @@ void tst_CertificateError::handleError()
     QCOMPARE(chain[1].serialNumber(), "3c:16:83:83:59:c4:2a:65:8f:7a:b2:07:10:14:4e:2d:70:9a:3e:23");
 
     if (deferError) {
-        QCOMPARE(page.loadSpy.count(), 0);
+        QCOMPARE(page.loadSpy.size(), 0);
         QCOMPARE(toPlainTextSync(&page), QString());
 
         if (acceptCertificate)
@@ -102,7 +102,7 @@ void tst_CertificateError::handleError()
 
         page.error.reset();
     }
-    QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.size(), 1, 30000);
     QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate);
     QCOMPARE(toPlainTextSync(&page), expectedContent);
     QVERIFY(server.stop());
diff --git a/tests/auto/core/devtools/tst_devtools.cpp b/tests/auto/core/devtools/tst_devtools.cpp
index 477b4cb20..57a2b83a3 100644
--- a/tests/auto/core/devtools/tst_devtools.cpp
+++ b/tests/auto/core/devtools/tst_devtools.cpp
@@ -21,7 +21,7 @@ void tst_DevTools::attachAndDestroyPageFirst()
 
     QSignalSpy spy(page, &QWebEnginePage::loadFinished);
     page->load(QUrl("data:text/plain,foobarbaz"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 12000);
 
     // shouldn't do anything until page is set
     page->triggerAction(QWebEnginePage::InspectElement);
@@ -49,7 +49,7 @@ void tst_DevTools::attachAndDestroyInspectorFirst()
 
     QSignalSpy spy(page, &QWebEnginePage::loadFinished);
     page->setHtml(QStringLiteral("<body><h1>FOO BAR!</h1></body>"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 12000);
 
     page->triggerAction(QWebEnginePage::InspectElement);
 
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 6596b3fa0..cef9c31d5 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -1022,7 +1022,7 @@ void tst_Origins::mixedContent()
         QTRY_COMPARE(eval(QSL("result !== undefined")), QVariant(true));
         auto result = eval(QSL("result")).toString();
         // Work-around some combinations missing JS loaded signals:
-        if (m_page->messages.count() > 0) {
+        if (m_page->messages.size() > 0) {
             if (m_page->messages[0] == QSL("Frame Loaded") && result == QSL("cannotLoad"))
                 result = QSL("canLoadButNotAccess");
             m_page->messages.clear();
diff --git a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
index 3ca28b901..defa06319 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
+++ b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
@@ -52,21 +52,21 @@ void tst_QWebEngineClientCertificateStore::addAndListCertificates()
     QWebEngineProfile::defaultProfile()->clientCertificateStore()->add(cert, sslKey);
     QWebEngineProfile::defaultProfile()->clientCertificateStore()->add(certSecond, sslKeySecond);
 
-    QCOMPARE(2, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().length());
+    QCOMPARE(2, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 }
 
 void tst_QWebEngineClientCertificateStore::removeAndClearCertificates()
 {
-    QCOMPARE(2, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().length());
+    QCOMPARE(2, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 
     // Remove one certificate from in-memory store
     auto list = QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates();
     QWebEngineProfile::defaultProfile()->clientCertificateStore()->remove(list[0]);
-    QCOMPARE(1, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().length());
+    QCOMPARE(1, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 
     // Remove all certificates in-memory store
     QWebEngineProfile::defaultProfile()->clientCertificateStore()->clear();
-    QCOMPARE(0, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().length());
+    QCOMPARE(0, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 }
 
 QTEST_MAIN(tst_QWebEngineClientCertificateStore)
diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index e0fee6b08..44c56561d 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -83,22 +83,22 @@ void tst_QWebEngineCookieStore::cookieSignals()
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 2);
 
     // try whether updating a cookie to be expired results in that cookie being removed.
     QNetworkCookie expiredCookie(QNetworkCookie::parseCookies(QByteArrayLiteral("SessionCookie=delete; expires=Thu, 01-Jan-1970 00:00:00 GMT; path=///resources")).first());
     client->setCookie(expiredCookie, QUrl("qrc:///resources/index.html"));
 
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 1);
     cookieRemovedSpy.clear();
 
     // try removing the other cookie.
     QNetworkCookie nonSessionCookie(QNetworkCookie::parseCookies(QByteArrayLiteral("CookieWithExpiresField=QtWebEngineCookieTest; path=///resources")).first());
     client->deleteCookie(nonSessionCookie, QUrl("qrc:///resources/index.html"));
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 1);
 }
 
 void tst_QWebEngineCookieStore::setAndDeleteCookie()
@@ -119,33 +119,33 @@ void tst_QWebEngineCookieStore::setAndDeleteCookie()
     client->loadAllCookies();
     // /* FIXME remove 'blank' navigation once loadAllCookies api is fixed
     page.load(QUrl("about:blank"));
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     // */
 
     // check if pending cookies are set and removed
     client->setCookie(cookie1);
     client->setCookie(cookie2);
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 2);
     client->deleteCookie(cookie1);
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 1);
 
     page.load(QUrl("qrc:///resources/content.html"));
 
-    QWE_TRY_COMPARE(loadSpy.count(), 2);
+    QWE_TRY_COMPARE(loadSpy.size(), 2);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 2);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 1);
     cookieAddedSpy.clear();
     cookieRemovedSpy.clear();
 
     client->setCookie(cookie3);
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 1);
     // updating a cookie with an expired 'expires' field should remove the cookie with the same name
     client->setCookie(expiredCookie3);
     client->deleteCookie(cookie2);
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 2);
 }
 
 void tst_QWebEngineCookieStore::batchCookieTasks()
@@ -164,29 +164,29 @@ void tst_QWebEngineCookieStore::batchCookieTasks()
     client->loadAllCookies();
     // /* FIXME remove 'blank' navigation once loadAllCookies api is fixed
     page.load(QUrl("about:blank"));
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     // */
 
     client->setCookie(cookie1);
     client->setCookie(cookie2);
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 2);
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QWE_TRY_COMPARE(loadSpy.count(), 2);
+    QWE_TRY_COMPARE(loadSpy.size(), 2);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 4);
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 0);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 4);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 0);
 
     cookieAddedSpy.clear();
     cookieRemovedSpy.clear();
 
     client->deleteSessionCookies();
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 3);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 3);
 
     client->deleteAllCookies();
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 4);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 4);
 }
 
 void tst_QWebEngineCookieStore::basicFilter()
@@ -203,22 +203,22 @@ void tst_QWebEngineCookieStore::basicFilter()
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 2);
     QWE_TRY_COMPARE(accessTested.loadAcquire(), 2); // FIXME?
 
     client->deleteAllCookies();
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 2);
 
     client->setCookieFilter([&](const QWebEngineCookieStore::FilterRequest &){ ++accessTested; return false; });
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QWE_TRY_COMPARE(accessTested.loadAcquire(), 4); // FIXME?
     // Test cookies are NOT added:
     QTest::qWait(100);
-    QCOMPARE(cookieAddedSpy.count(), 2);
+    QCOMPARE(cookieAddedSpy.size(), 2);
 }
 
 void tst_QWebEngineCookieStore::basicFilterOverHTTP()
@@ -259,25 +259,25 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
     QUrl firstPartyUrl = httpServer.url("/test.html");
     page.load(firstPartyUrl);
 
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 1);
     QWE_TRY_COMPARE(accessTested.loadAcquire(), 4);
     QVERIFY(cookieRequestHeader.isEmpty());
 
-    QWE_TRY_COMPARE(serverSpy.count(), 3);
+    QWE_TRY_COMPARE(serverSpy.size(), 3);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(!cookieRequestHeader.isEmpty());
-    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.size(), 1);
     QWE_TRY_COMPARE(accessTested.loadAcquire(), 6);
 
-    QWE_TRY_COMPARE(serverSpy.count(), 5);
+    QWE_TRY_COMPARE(serverSpy.size(), 5);
 
     client->deleteAllCookies();
-    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.size(), 1);
 
     client->setCookieFilter([&](const QWebEngineCookieStore::FilterRequest &request) {
         resourceFirstParty.append(qMakePair(request.origin, request.firstPartyUrl));
@@ -285,24 +285,24 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
         return false;
     });
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(cookieRequestHeader.isEmpty());
     // Test cookies are NOT added:
     QTest::qWait(100);
-    QCOMPARE(cookieAddedSpy.count(), 1);
+    QCOMPARE(cookieAddedSpy.size(), 1);
     QWE_TRY_COMPARE(accessTested.loadAcquire(), 9);
 
-    QWE_TRY_COMPARE(serverSpy.count(), 7);
+    QWE_TRY_COMPARE(serverSpy.size(), 7);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(cookieRequestHeader.isEmpty());
-    QCOMPARE(cookieAddedSpy.count(), 1);
+    QCOMPARE(cookieAddedSpy.size(), 1);
 
     // Wait for last GET /favicon.ico
-    QWE_TRY_COMPARE(serverSpy.count(), 9);
+    QWE_TRY_COMPARE(serverSpy.size(), 9);
     (void) httpServer.stop();
 
     QCOMPARE(resourceFirstParty.size(), accessTested.loadAcquire());
@@ -323,7 +323,7 @@ void tst_QWebEngineCookieStore::html5featureFilter()
 
     page.load(QUrl("qrc:///resources/content.html"));
 
-    QWE_TRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QCOMPARE(accessTested.loadAcquire(), 0); // FIXME?
     QTest::ignoreMessage(QtCriticalMsg, QRegularExpression(".*Uncaught SecurityError.*sessionStorage.*"));
diff --git a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
index e3b778396..a1804e179 100644
--- a/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
+++ b/tests/auto/pdf/qpdfbookmarkmodel/tst_qpdfbookmarkmodel.cpp
@@ -63,8 +63,8 @@ void tst_QPdfBookmarkModel::setEmptyDocumentAndLoad()
 
     QCOMPARE(document.load(QFINDTESTDATA("pdf-sample.bookmarks.pdf")), QPdfDocument::Error::None);
 
-    QCOMPARE(modelAboutToBeResetSpy.count(), 1);
-    QCOMPARE(modelResetSpy.count(), 1);
+    QCOMPARE(modelAboutToBeResetSpy.size(), 1);
+    QCOMPARE(modelResetSpy.size(), 1);
 
     QCOMPARE(model.rowCount(), 3);
 }
@@ -81,8 +81,8 @@ void tst_QPdfBookmarkModel::setLoadedDocument()
 
     model.setDocument(&document);
 
-    QCOMPARE(modelAboutToBeResetSpy.count(), 1);
-    QCOMPARE(modelResetSpy.count(), 1);
+    QCOMPARE(modelAboutToBeResetSpy.size(), 1);
+    QCOMPARE(modelResetSpy.size(), 1);
 
     QCOMPARE(model.rowCount(), 3);
 }
@@ -102,8 +102,8 @@ void tst_QPdfBookmarkModel::unloadDocument()
 
     document.close();
 
-    QCOMPARE(modelAboutToBeResetSpy.count(), 1);
-    QCOMPARE(modelResetSpy.count(), 1);
+    QCOMPARE(modelAboutToBeResetSpy.size(), 1);
+    QCOMPARE(modelResetSpy.size(), 1);
 
     QCOMPARE(model.rowCount(), 0);
 }
diff --git a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
index 975708f65..96a0e265e 100644
--- a/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
+++ b/tests/auto/pdf/qpdfdocument/tst_qpdfdocument.cpp
@@ -86,7 +86,7 @@ void tst_QPdfDocument::pageCount()
     QCOMPARE(doc.pageCount(), 0);
     QCOMPARE(doc.load(tempPdf.fileName()), QPdfDocument::Error::None);
     QCOMPARE(doc.pageCount(), 2);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
 
     QCOMPARE(doc.pagePointSize(0).toSize(), tempPdf.pageLayout.fullRectPoints().size());
@@ -99,12 +99,12 @@ void tst_QPdfDocument::loadFromIODevice()
     QSignalSpy statusChangedSpy(&doc, SIGNAL(statusChanged(QPdfDocument::Status)));
     QSignalSpy pageCountChangedSpy(&doc, SIGNAL(pageCountChanged(int)));
     doc.load(&tempPdf);
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Ready);
     QCOMPARE(doc.error(), QPdfDocument::Error::None);
     QCOMPARE(doc.pageCount(), 2);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
 
     consistencyCheck(doc);
@@ -136,11 +136,11 @@ void tst_QPdfDocument::loadAsync()
 
     doc.load(reply.data());
 
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Ready);
     QCOMPARE(doc.pageCount(), 2);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
 
     consistencyCheck(doc);
@@ -153,13 +153,13 @@ void tst_QPdfDocument::password()
 
     QCOMPARE(doc.pageCount(), 0);
     QCOMPARE(doc.load(QFINDTESTDATA("pdf-sample.protected.pdf")), QPdfDocument::Error::IncorrectPassword);
-    QCOMPARE(passwordChangedSpy.count(), 0);
+    QCOMPARE(passwordChangedSpy.size(), 0);
     doc.setPassword(QStringLiteral("WrongPassword"));
-    QCOMPARE(passwordChangedSpy.count(), 1);
+    QCOMPARE(passwordChangedSpy.size(), 1);
     QCOMPARE(doc.load(QFINDTESTDATA("pdf-sample.protected.pdf")), QPdfDocument::Error::IncorrectPassword);
     QCOMPARE(doc.status(), QPdfDocument::Status::Error);
     doc.setPassword(QStringLiteral("Qt"));
-    QCOMPARE(passwordChangedSpy.count(), 2);
+    QCOMPARE(passwordChangedSpy.size(), 2);
     QCOMPARE(doc.load(QFINDTESTDATA("pdf-sample.protected.pdf")), QPdfDocument::Error::None);
     QCOMPARE(doc.pageCount(), 1);
 }
@@ -174,10 +174,10 @@ void tst_QPdfDocument::close()
 
     doc.load(&tempPdf);
 
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Ready);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
 
     statusChangedSpy.clear();
@@ -188,11 +188,11 @@ void tst_QPdfDocument::close()
         return;
 
     doc.close();
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Unloading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Null);
     QCOMPARE(doc.pageCount(), 0);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
 }
 
@@ -205,30 +205,30 @@ void tst_QPdfDocument::loadAfterClose()
     QSignalSpy pageCountChangedSpy(&doc, SIGNAL(pageCountChanged(int)));
 
     doc.load(&tempPdf);
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Ready);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
     statusChangedSpy.clear();
     pageCountChangedSpy.clear();
 
     doc.close();
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Unloading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Null);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
     statusChangedSpy.clear();
     pageCountChangedSpy.clear();
 
     doc.load(&tempPdf);
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Ready);
     QCOMPARE(doc.error(), QPdfDocument::Error::None);
     QCOMPARE(doc.pageCount(), 2);
-    QCOMPARE(pageCountChangedSpy.count(), 1);
+    QCOMPARE(pageCountChangedSpy.size(), 1);
     QCOMPARE(pageCountChangedSpy[0][0].toInt(), doc.pageCount());
 
     consistencyCheck(doc);
@@ -249,10 +249,10 @@ void tst_QPdfDocument::closeOnDestroy()
 
         delete doc;
 
-        QCOMPARE(statusChangedSpy.count(), 2);
+        QCOMPARE(statusChangedSpy.size(), 2);
         QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Unloading);
         QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Null);
-        QCOMPARE(pageCountChangedSpy.count(), 1);
+        QCOMPARE(pageCountChangedSpy.size(), 1);
         QCOMPARE(pageCountChangedSpy[0][0].toInt(), 0);
     }
 
@@ -267,8 +267,8 @@ void tst_QPdfDocument::closeOnDestroy()
 
         delete doc;
 
-        QCOMPARE(statusChangedSpy.count(), 0);
-        QCOMPARE(pageCountChangedSpy.count(), 0);
+        QCOMPARE(statusChangedSpy.size(), 0);
+        QCOMPARE(pageCountChangedSpy.size(), 0);
     }
 }
 
@@ -283,7 +283,7 @@ void tst_QPdfDocument::status()
 
     // open existing document
     doc.load(&tempPdf);
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Ready);
     statusChangedSpy.clear();
@@ -293,7 +293,7 @@ void tst_QPdfDocument::status()
     // close document
     doc.close();
 
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Unloading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Null);
     statusChangedSpy.clear();
@@ -302,7 +302,7 @@ void tst_QPdfDocument::status()
 
     // try to open non-existing document
     doc.load(QFINDTESTDATA("does-not-exist.pdf"));
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Error);
     QCOMPARE(doc.status(), QPdfDocument::Status::Error);
@@ -320,13 +320,13 @@ void tst_QPdfDocument::status()
     stopWatch.start();
     forever {
         QCoreApplication::instance()->processEvents();
-        if (statusChangedSpy.count() == 2)
+        if (statusChangedSpy.size() == 2)
             break;
         if (stopWatch.elapsed() >= 30000)
             break;
     }
 
-    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(statusChangedSpy.size(), 2);
     QCOMPARE(statusChangedSpy[0][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Loading);
     QCOMPARE(statusChangedSpy[1][0].value<QPdfDocument::Status>(), QPdfDocument::Status::Error);
     statusChangedSpy.clear();
@@ -340,17 +340,17 @@ void tst_QPdfDocument::passwordClearedOnClose()
     QSignalSpy passwordChangedSpy(&doc, SIGNAL(passwordChanged()));
 
     doc.setPassword(QStringLiteral("Qt"));
-    QCOMPARE(passwordChangedSpy.count(), 1);
+    QCOMPARE(passwordChangedSpy.size(), 1);
     QCOMPARE(doc.load(QFINDTESTDATA("pdf-sample.protected.pdf")), QPdfDocument::Error::None);
     passwordChangedSpy.clear();
 
     doc.close(); // password is cleared on close
-    QCOMPARE(passwordChangedSpy.count(), 1);
+    QCOMPARE(passwordChangedSpy.size(), 1);
     passwordChangedSpy.clear();
 
     doc.load(&tempPdf);
     doc.close(); // signal is not emitted if password didn't change
-    QCOMPARE(passwordChangedSpy.count(), 0);
+    QCOMPARE(passwordChangedSpy.size(), 0);
 }
 
 void tst_QPdfDocument::metaData()
diff --git a/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp b/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp
index a958123c7..39d32df0b 100644
--- a/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp
+++ b/tests/auto/pdf/qpdfpagerenderer/tst_qpdfpagerenderer.cpp
@@ -64,7 +64,7 @@ void tst_QPdfPageRenderer::withLoadedDocumentSingleThreaded()
     const quint64 requestId = pageRenderer.requestPage(0, imageSize);
 
     QCOMPARE(requestId, quint64(1));
-    QTRY_COMPARE(pageRenderedSpy.count(), 1);
+    QTRY_COMPARE(pageRenderedSpy.size(), 1);
     QCOMPARE(pageRenderedSpy[0][0].toInt(), 0);
     QCOMPARE(pageRenderedSpy[0][1].toSize(), imageSize);
     QCOMPARE(pageRenderedSpy[0][2].value<QImage>().size(), imageSize);
@@ -87,7 +87,7 @@ void tst_QPdfPageRenderer::withLoadedDocumentMultiThreaded()
     const quint64 requestId = pageRenderer.requestPage(0, imageSize);
 
     QCOMPARE(requestId, quint64(1));
-    QTRY_COMPARE(pageRenderedSpy.count(), 1);
+    QTRY_COMPARE(pageRenderedSpy.size(), 1);
     QCOMPARE(pageRenderedSpy[0][0].toInt(), 0);
     QCOMPARE(pageRenderedSpy[0][1].toSize(), imageSize);
     QCOMPARE(pageRenderedSpy[0][2].value<QImage>().size(), imageSize);
@@ -108,7 +108,7 @@ void tst_QPdfPageRenderer::switchingRenderMode()
     const QSize imageSize(100, 100);
     const quint64 firstRequestId = pageRenderer.requestPage(0, imageSize);
 
-    QTRY_COMPARE(pageRenderedSpy.count(), 1);
+    QTRY_COMPARE(pageRenderedSpy.size(), 1);
     QCOMPARE(pageRenderedSpy[0][0].toInt(), 0);
     QCOMPARE(pageRenderedSpy[0][1].toSize(), imageSize);
     QCOMPARE(pageRenderedSpy[0][2].value<QImage>().size(), imageSize);
@@ -124,7 +124,7 @@ void tst_QPdfPageRenderer::switchingRenderMode()
     const quint64 secondRequestId = pageRenderer.requestPage(0, imageSize);
 
     QVERIFY(firstRequestId != secondRequestId);
-    QTRY_COMPARE(pageRenderedSpy.count(), 1);
+    QTRY_COMPARE(pageRenderedSpy.size(), 1);
     QCOMPARE(pageRenderedSpy[0][0].toInt(), 0);
     QCOMPARE(pageRenderedSpy[0][1].toSize(), imageSize);
     QCOMPARE(pageRenderedSpy[0][2].value<QImage>(), image);
@@ -138,7 +138,7 @@ void tst_QPdfPageRenderer::switchingRenderMode()
 
     const quint64 thirdRequestId = pageRenderer.requestPage(0, imageSize);
 
-    QTRY_COMPARE(pageRenderedSpy.count(), 1);
+    QTRY_COMPARE(pageRenderedSpy.size(), 1);
     QCOMPARE(pageRenderedSpy[0][0].toInt(), 0);
     QCOMPARE(pageRenderedSpy[0][1].toSize(), imageSize);
     QCOMPARE(pageRenderedSpy[0][2].value<QImage>(), image);
diff --git a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
index eb70ebf17..48cec928f 100644
--- a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
+++ b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
@@ -259,25 +259,25 @@ void tst_MultiPageView::password()
 
     QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
 
-    QTRY_COMPARE(passwordRequiredSpy.count(), 1);
+    QTRY_COMPARE(passwordRequiredSpy.size(), 1);
     qCDebug(lcTests) << "error while awaiting password" << doc->error()
-                     << "passwordRequired count" << passwordRequiredSpy.count()
-                     << "statusChanged count" << statusChangedSpy.count();
+                     << "passwordRequired count" << passwordRequiredSpy.size()
+                     << "statusChanged count" << statusChangedSpy.size();
     QCOMPARE(doc->property("status").toInt(), int(QPdfDocument::Status::Error));
-    QCOMPARE(pageCountChangedSpy.count(), 0);
-    QCOMPARE(extPageCountChangedSpy.count(), 0);
-    QCOMPARE(statusChangedSpy.count(), 2); // Loading and then Error
+    QCOMPARE(pageCountChangedSpy.size(), 0);
+    QCOMPARE(extPageCountChangedSpy.size(), 0);
+    QCOMPARE(statusChangedSpy.size(), 2); // Loading and then Error
     statusChangedSpy.clear();
     QVERIFY(doc->setProperty("password", u"Qt"_qs));
-    QCOMPARE(passwordChangedSpy.count(), 1);
+    QCOMPARE(passwordChangedSpy.size(), 1);
     QTRY_COMPARE(doc->property("status").toInt(), int(QPdfDocument::Status::Ready));
     qCDebug(lcTests) << "after setPassword" << doc->error()
-                     << "passwordChanged count" << passwordChangedSpy.count()
-                     << "statusChanged count" << statusChangedSpy.count()
-                     << "pageCountChanged count" << pageCountChangedSpy.count();
-    QCOMPARE(statusChangedSpy.count(), 2); // Loading and then Ready
-    QCOMPARE(pageCountChangedSpy.count(), 1);
-    QCOMPARE(extPageCountChangedSpy.count(), pageCountChangedSpy.count());
+                     << "passwordChanged count" << passwordChangedSpy.size()
+                     << "statusChanged count" << statusChangedSpy.size()
+                     << "pageCountChanged count" << pageCountChangedSpy.size();
+    QCOMPARE(statusChangedSpy.size(), 2); // Loading and then Ready
+    QCOMPARE(pageCountChangedSpy.size(), 1);
+    QCOMPARE(extPageCountChangedSpy.size(), pageCountChangedSpy.size());
 }
 
 void tst_MultiPageView::selectionAndClipboard()
@@ -294,7 +294,7 @@ void tst_MultiPageView::selectionAndClipboard()
 
     QVERIFY(QMetaObject::invokeMethod(pdfView, "selectAll"));
     QString sel = pdfView->property("selectedText").toString();
-    QCOMPARE(sel.length(), 1073);
+    QCOMPARE(sel.size(), 1073);
 
 #if QT_CONFIG(clipboard)
     QClipboard *clip = qApp->clipboard();
@@ -332,13 +332,13 @@ void tst_MultiPageView::search()
     QTRY_COMPARE(searchModel->rowCount(QModelIndex()), 7); // occurrences of the word "PDF" in this file
     const int count = searchModel->rowCount(QModelIndex());
     QList<QList<QPointF>> resultOutlines = multiline->property("paths").value<QList<QList<QPointF>>>();
-    QCOMPARE(resultOutlines.count(), 7);
+    QCOMPARE(resultOutlines.size(), 7);
     QPoint contentPos = tableViewContentPos(table);
     int movements = 0;
     for (int i = 0; i < count; ++i) {
         // only one page, so IndexOnPage data is the same as overall index
         QCOMPARE(i, searchModel->data(searchModel->index(i), int(QPdfSearchModel::Role::IndexOnPage)).toInt());
-        QCOMPARE(resultOutlines.at(i).count(), 5); // 5-point polygon is a rectangle (including drawing back to the start, to close it)
+        QCOMPARE(resultOutlines.at(i).size(), 5); // 5-point polygon is a rectangle (including drawing back to the start, to close it)
         QCOMPARE(resultOutlines.at(i).first(), searchModel->data(searchModel->index(i), int(QPdfSearchModel::Role::Location)).toPointF());
 
         QVERIFY(QMetaObject::invokeMethod(pdfView, "searchForward"));
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp
index 086587cf4..2b861efa6 100644
--- a/tests/auto/quick/dialogs/tst_dialogs.cpp
+++ b/tests/auto/quick/dialogs/tst_dialogs.cpp
@@ -71,7 +71,7 @@ void tst_Dialogs::createDialog(const QLatin1String &dialog, bool &ok)
     m_listener->runJavaScript(trigger.arg(dialog));
     QTRY_VERIFY(m_listener->ready());
     QTest::mouseClick(m_window, Qt::LeftButton);
-    QTRY_COMPARE(dialogSpy.count(), 1);
+    QTRY_COMPARE(dialogSpy.size(), 1);
     ok = true;
 }
 
@@ -96,7 +96,7 @@ void tst_Dialogs::contextMenuRequested()
     QTRY_COMPARE_WITH_TIMEOUT(m_listener->ready(), true, 20000);
     QSignalSpy dialogSpy(m_listener, &TestHandler::requestChanged);
     QTest::mouseClick(m_window, Qt::RightButton);
-    QTRY_COMPARE(dialogSpy.count(), 1);
+    QTRY_COMPARE(dialogSpy.size(), 1);
     auto dialog = qobject_cast<QWebEngineContextMenuRequest *>(m_listener->request());
     QVERIFY2(dialog, "Incorrect dialog requested");
 }
@@ -153,7 +153,7 @@ void tst_Dialogs::authenticationDialogRequested()
     QSignalSpy dialogSpy(m_listener, &TestHandler::requestChanged);
     m_listener->load(url);
 
-    QTRY_COMPARE(dialogSpy.count(), 1);
+    QTRY_COMPARE(dialogSpy.size(), 1);
     auto *dialog = qobject_cast<QQuickWebEngineAuthenticationDialogRequest*>(m_listener->request());
     QVERIFY2(dialog, "Incorrect dialog requested");
     dialog->dialogReject();
@@ -197,7 +197,7 @@ void tst_Dialogs::javaScriptDialogRequested()
 
     QSignalSpy dialogSpy(m_listener, &TestHandler::requestChanged);
     m_listener->runJavaScript(script);
-    QTRY_COMPARE(dialogSpy.count(), 1);
+    QTRY_COMPARE(dialogSpy.size(), 1);
     auto *dialog = qobject_cast<QQuickWebEngineJavaScriptDialogRequest*>(m_listener->request());
     QVERIFY2(dialog, "Incorrect dialog requested");
     dialog->dialogReject();
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 5018c7e78..bfa411416 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -109,7 +109,7 @@ public:
     {
         QDir dir(dirname);
         QFileInfoList entries(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot));
-        for (int i = 0; i < entries.count(); ++i) {
+        for (int i = 0; i < entries.size(); ++i) {
             if (entries[i].isDir())
                 removeRecursive(entries[i].filePath());
             else
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 5b5003846..fe9f42053 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -423,10 +423,10 @@ void tst_QQuickWebEngineView::transparentWebEngineViews()
         for (int i = 0; i < image.width(); i++)
             for (int j = 0; j < image.height(); j++)
                 colors.insert(image.pixel(i, j));
-        return colors.count() > 1;
+        return colors.size() > 1;
     });
 
-    QVERIFY(colors.count() > 1);
+    QVERIFY(colors.size() > 1);
     QVERIFY(colors.contains(qRgb(0, 0, 0)));     // black
     QVERIFY(colors.contains(qRgb(255, 0, 0)));   // red
     for (auto color : colors) {
@@ -599,12 +599,12 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
                   "  <input type='text' id='input1' />"
                   "</body></html>");
     QVERIFY(waitForLoadSucceeded(view));
-    QCOMPARE(testContext.infos.count(), 0);
+    QCOMPARE(testContext.infos.size(), 0);
 
     // Set focus on an input field.
     QPoint textInputCenter = elementCenter(view, "input1");
     QTest::mouseClick(view->window(), Qt::LeftButton, {}, textInputCenter);
-    QTRY_COMPARE(testContext.infos.count(), 2);
+    QTRY_COMPARE(testContext.infos.size(), 2);
     QCOMPARE(evaluateJavaScriptSync(view, "document.activeElement.id").toString(), QStringLiteral("input1"));
     foreach (const InputMethodInfo &info, testContext.infos) {
         QCOMPARE(info.cursorPosition, 0);
@@ -616,7 +616,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
 
     // Change content of an input field from JavaScript.
     evaluateJavaScriptSync(view, "document.getElementById('input1').value='QtWebEngine';");
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 11);
     QCOMPARE(testContext.infos[0].anchorPosition, 11);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine"));
@@ -625,7 +625,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
 
     // Change content of an input field by key press.
     QTest::keyClick(view->window(), Qt::Key_Exclam);
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 12);
     QCOMPARE(testContext.infos[0].anchorPosition, 12);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -634,7 +634,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
 
     // Change cursor position.
     QTest::keyClick(view->window(), Qt::Key_Left);
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 11);
     QCOMPARE(testContext.infos[0].anchorPosition, 11);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -649,7 +649,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("", attributes);
         QGuiApplication::sendEvent(qApp->focusObject(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 2);
+    QTRY_COMPARE(testContext.infos.size(), 2);
 
     // As a first step, Chromium moves the cursor to the start of the selection.
     // We don't filter this in QtWebEngine because we don't know yet if this is part of a selection.
@@ -673,7 +673,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("", attributes);
         QGuiApplication::sendEvent(qApp->focusObject(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 0);
     QCOMPARE(testContext.infos[0].anchorPosition, 0);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -686,7 +686,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("123", attributes);
         QGuiApplication::sendEvent(qApp->focusObject(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 3);
     QCOMPARE(testContext.infos[0].anchorPosition, 3);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -700,7 +700,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("", attributes);
         QGuiApplication::sendEvent(qApp->focusObject(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 2);
+    QTRY_COMPARE(testContext.infos.size(), 2);
     foreach (const InputMethodInfo &info, testContext.infos) {
         QCOMPARE(info.cursorPosition, 0);
         QCOMPARE(info.anchorPosition, 0);
@@ -717,7 +717,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
         event.setCommitString(QStringLiteral("123"), 0, 0);
         QGuiApplication::sendEvent(qApp->focusObject(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 3);
     QCOMPARE(testContext.infos[0].anchorPosition, 3);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("123QtWebEngine!"));
@@ -727,7 +727,7 @@ void tst_QQuickWebEngineView::inputContextQueryInput()
 
     // Focus out.
     QTest::keyPress(view->window(), Qt::Key_Tab);
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QTRY_COMPARE(evaluateJavaScriptSync(view, "document.activeElement.id").toString(), QStringLiteral(""));
     testContext.infos.clear();
 }
@@ -838,7 +838,7 @@ void tst_QQuickWebEngineView::printToPdf()
     QSignalSpy savePdfSpy(view, SIGNAL(pdfPrintingFinished(const QString&, bool)));
     QString path = tempDir.path() + "/print_success.pdf";
     view->printToPdf(path, QQuickWebEngineView::A4, QQuickWebEngineView::Portrait);
-    QTRY_VERIFY2(savePdfSpy.count() == 1, "Printing to PDF file failed without signal");
+    QTRY_VERIFY2(savePdfSpy.size() == 1, "Printing to PDF file failed without signal");
     QList<QVariant> successArguments = savePdfSpy.takeFirst();
     QVERIFY2(successArguments.at(0).toString() == path, "File path for first saved PDF does not match arguments");
     QVERIFY2(successArguments.at(1).toBool() == true, "Printing to PDF file failed though it should succeed");
@@ -849,7 +849,7 @@ void tst_QQuickWebEngineView::printToPdf()
     path = tempDir.path() + "/print_|fail.pdf";
 #endif // #if !defined(Q_OS_WIN)
     view->printToPdf(path, QQuickWebEngineView::A4, QQuickWebEngineView::Portrait);
-    QTRY_VERIFY2(savePdfSpy.count() == 1, "Printing to PDF file failed without signal");
+    QTRY_VERIFY2(savePdfSpy.size() == 1, "Printing to PDF file failed without signal");
     QList<QVariant> failedArguments = savePdfSpy.takeFirst();
     QVERIFY2(failedArguments.at(0).toString() == path, "File path for second saved PDF does not match arguments");
     QVERIFY2(failedArguments.at(1).toBool() == false, "Printing to PDF file succeeded though it should fail");
diff --git a/tests/auto/util/quickutil.h b/tests/auto/util/quickutil.h
index f7e08f842..687cb94dc 100644
--- a/tests/auto/util/quickutil.h
+++ b/tests/auto/util/quickutil.h
@@ -113,7 +113,7 @@ inline QPoint elementCenter(QQuickWebEngineView *view, const QString &id)
             "})()");
     QVariantList rectList = evaluateJavaScriptSync(view, jsCode).toList();
 
-    if (rectList.count() != 2) {
+    if (rectList.size() != 2) {
         qWarning("elementCenter failed.");
         return QPoint();
     }
diff --git a/tests/auto/util/util.h b/tests/auto/util/util.h
index 455dff20c..2da339733 100644
--- a/tests/auto/util/util.h
+++ b/tests/auto/util/util.h
@@ -43,7 +43,7 @@ public:
 
     bool ensureSignalEmitted()
     {
-        bool result = count() > 0;
+        bool result = size() > 0;
         if (!result)
             result = wait();
         clear();
@@ -162,7 +162,7 @@ static inline QRect elementGeometry(QWebEnginePage *page, const QString &id)
                 "})()");
     QVariantList coords = evaluateJavaScriptSync(page, jsCode).toList();
 
-    if (coords.count() != 4) {
+    if (coords.size() != 4) {
         qWarning("elementGeometry faield.");
         return QRect();
     }
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 5bb4e822b..a420d041c 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -532,7 +532,7 @@ void tst_Accessibility::roles()
     QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished);
     webView.setHtml("<html><body>" + html + "</body></html>");
     webView.show();
-    QTRY_COMPARE_WITH_TIMEOUT(spyFinished.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spyFinished.size(), 1, 20000);
 
     QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
 
diff --git a/tests/auto/widgets/favicon/tst_favicon.cpp b/tests/auto/widgets/favicon/tst_favicon.cpp
index dc1e9f096..c70aa1182 100644
--- a/tests/auto/widgets/favicon/tst_favicon.cpp
+++ b/tests/auto/widgets/favicon/tst_favicon.cpp
@@ -88,9 +88,9 @@ void tst_Favicon::faviconLoad()
                                    + QLatin1String("/resources/favicon-single.html"));
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(iconUrl, m_page->iconUrl());
@@ -101,7 +101,7 @@ void tst_Favicon::faviconLoad()
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
 
-    QCOMPARE(icon.availableSizes().count(), 2);
+    QCOMPARE(icon.availableSizes().size(), 2);
     QVERIFY(icon.availableSizes().contains(QSize(16, 16)));
     QVERIFY(icon.availableSizes().contains(QSize(32, 32)));
 }
@@ -115,9 +115,9 @@ void tst_Favicon::faviconLoadFromResources()
     QUrl url("qrc:/resources/favicon-single.html");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(iconUrl, m_page->iconUrl());
@@ -126,7 +126,7 @@ void tst_Favicon::faviconLoadFromResources()
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
 
-    QCOMPARE(icon.availableSizes().count(), 2);
+    QCOMPARE(icon.availableSizes().size(), 2);
     QVERIFY(icon.availableSizes().contains(QSize(16, 16)));
     QVERIFY(icon.availableSizes().contains(QSize(32, 32)));
 }
@@ -150,9 +150,9 @@ void tst_Favicon::faviconLoadEncodedUrl()
     QUrl url(urlString + QLatin1String("?favicon=load should work with#whitespace!"));
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
@@ -163,7 +163,7 @@ void tst_Favicon::faviconLoadEncodedUrl()
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
 
-    QCOMPARE(icon.availableSizes().count(), 2);
+    QCOMPARE(icon.availableSizes().size(), 2);
     QVERIFY(icon.availableSizes().contains(QSize(16, 16)));
     QVERIFY(icon.availableSizes().contains(QSize(32, 32)));
 }
@@ -175,27 +175,27 @@ void tst_Favicon::faviconLoadAfterHistoryNavigation()
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
     m_page->load(QUrl("qrc:/resources/favicon-single.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qt32.ico"));
 
     m_page->load(QUrl("qrc:/resources/favicon-multi.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 2, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 3);
-    QTRY_COMPARE(iconChangedSpy.count(), 3);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 2, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 3);
+    QTRY_COMPARE(iconChangedSpy.size(), 3);
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qtmulti.ico"));
 
     m_page->triggerAction(QWebEnginePage::Back);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 3, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 5);
-    QTRY_COMPARE(iconChangedSpy.count(), 5);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 3, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 5);
+    QTRY_COMPARE(iconChangedSpy.size(), 5);
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qt32.ico"));
 
     m_page->triggerAction(QWebEnginePage::Forward);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 4, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 7);
-    QTRY_COMPARE(iconChangedSpy.count(), 7);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 4, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 7);
+    QTRY_COMPARE(iconChangedSpy.size(), 7);
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qtmulti.ico"));
 }
 
@@ -208,9 +208,9 @@ void tst_Favicon::faviconLoadPushState()
     QUrl url("qrc:/resources/favicon-single.html");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(iconUrl, m_page->iconUrl());
@@ -229,8 +229,8 @@ void tst_Favicon::faviconLoadPushState()
     QTRY_COMPARE(m_page->history()->count(), 2);
 
     // Favicon change is not expected.
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
     QCOMPARE(m_page->iconUrl(), QUrl("qrc:/resources/icons/qt32.ico"));
 }
 
@@ -251,9 +251,9 @@ void tst_Favicon::noFavicon()
                                    + QLatin1String("/resources/test1.html"));
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -268,9 +268,9 @@ void tst_Favicon::aboutBlank()
     QUrl url("about:blank");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -293,9 +293,9 @@ void tst_Favicon::unavailableFavicon()
                                    + QLatin1String("/resources/favicon-unavailable.html"));
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -312,9 +312,9 @@ void tst_Favicon::errorPageEnabled()
     QUrl url("http://url.invalid");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -331,9 +331,9 @@ void tst_Favicon::errorPageDisabled()
     QUrl url("http://url.invalid");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -356,9 +356,9 @@ void tst_Favicon::touchIcon()
                                    + QLatin1String("/resources/favicon-touch.html"));
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -387,9 +387,9 @@ void tst_Favicon::multiIcon()
     m_page->settings()->setAttribute(QWebEngineSettings::TouchIconsEnabled, false);
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
@@ -399,14 +399,14 @@ void tst_Favicon::multiIcon()
 
     icon = m_page->icon();
     QVERIFY(!icon.isNull());
-    QCOMPARE(icon.availableSizes().count(), 2);
+    QCOMPARE(icon.availableSizes().size(), 2);
     QVERIFY(icon.availableSizes().contains(QSize(16, 16)));
     QVERIFY(icon.availableSizes().contains(QSize(32, 32)));
 
     // Reset
     loadFinishedSpy.clear();
     m_page->load(QUrl("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     iconUrlChangedSpy.clear();
     iconChangedSpy.clear();
     loadFinishedSpy.clear();
@@ -416,9 +416,9 @@ void tst_Favicon::multiIcon()
     m_page->settings()->setAttribute(QWebEngineSettings::TouchIconsEnabled, true);
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
@@ -428,7 +428,7 @@ void tst_Favicon::multiIcon()
 
     icon = m_page->icon();
     QVERIFY(!icon.isNull());
-    QCOMPARE(icon.availableSizes().count(), 1);
+    QCOMPARE(icon.availableSizes().size(), 1);
     QVERIFY(icon.availableSizes().contains(QSize(64, 64)));
 }
 
@@ -454,9 +454,9 @@ void tst_Favicon::downloadIconsDisabled()
 
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QCOMPARE(iconUrlChangedSpy.count(), 0);
-    QCOMPARE(iconChangedSpy.count(), 0);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QCOMPARE(iconUrlChangedSpy.size(), 0);
+    QCOMPARE(iconChangedSpy.size(), 0);
 
     QVERIFY(m_page->iconUrl().isEmpty());
     QVERIFY(m_page->icon().isNull());
@@ -491,9 +491,9 @@ void tst_Favicon::downloadTouchIconsEnabled()
 
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     const QUrl &iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
@@ -502,7 +502,7 @@ void tst_Favicon::downloadTouchIconsEnabled()
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
 
-    QCOMPARE(icon.availableSizes().count(), 1);
+    QCOMPARE(icon.availableSizes().size(), 1);
     QCOMPARE(icon.availableSizes().first(), expectedIconSize);
 }
 
@@ -524,9 +524,9 @@ void tst_Favicon::dynamicFavicon()
                     "<link rel='icon' type='image/png' "
                     "href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='/>"
                     "</html>");
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     QCOMPARE(m_page->icon().pixmap(1, 1).toImage().pixelColor(0, 0), QColor(Qt::black));
 
@@ -535,7 +535,7 @@ void tst_Favicon::dynamicFavicon()
         evaluateJavaScriptSync(
                 m_page,
                 "document.getElementsByTagName('link')[0].href = 'data:image/png;base64," + colors[color] + "';");
-        QTRY_COMPARE(iconChangedSpy.count(), 1);
+        QTRY_COMPARE(iconChangedSpy.size(), 1);
         QTRY_COMPARE(m_page->iconUrl().toString(),
                      QString("data:image/png;base64," + colors[color]));
         QCOMPARE(m_page->icon().pixmap(1, 1).toImage().pixelColor(0, 0), QColor(color));
@@ -555,13 +555,13 @@ void tst_Favicon::touchIconWithSameURL()
                     "<link rel='icon' type='image/png' href='" + icon + "'/>"
                     "<link rel='apple-touch-icon' type='image/png' href='" + icon + "'/>"
                     "</html>");
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
 
     // The default favicon has to be loaded even if its URL is also set as a touch icon while touch
     // icons are disabled.
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
     QCOMPARE(m_page->iconUrl().toString(), icon);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     loadFinishedSpy.clear();
     iconUrlChangedSpy.clear();
@@ -570,13 +570,13 @@ void tst_Favicon::touchIconWithSameURL()
     m_page->setHtml("<html>"
                     "<link rel='apple-touch-icon' type='image/png' href='" + icon + "'/>"
                     "</html>");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     // This page only has a touch icon. With disabled touch icons we don't expect any icon to be
     // shown even if the same icon was loaded previously.
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
     QVERIFY(m_page->iconUrl().toString().isEmpty());
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 }
 
 void tst_Favicon::iconDatabaseOTR()
@@ -592,9 +592,9 @@ void tst_Favicon::iconDatabaseOTR()
 
     page->load(QUrl("qrc:/resources/favicon-misc.html"));
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     {
         bool iconRequestDone = false;
@@ -647,15 +647,15 @@ void tst_Favicon::requestIconForIconURL()
 
     page->load(QUrl("qrc:/resources/favicon-misc.html"));
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     page->load(QUrl("about:blank"));
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 2);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 2);
-    QTRY_COMPARE(iconChangedSpy.count(), 2);
+    QTRY_COMPARE(loadFinishedSpy.size(), 2);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 2);
+    QTRY_COMPARE(iconChangedSpy.size(), 2);
     QVERIFY(page->icon().isNull());
     QVERIFY(page->iconUrl().isEmpty());
 
@@ -717,15 +717,15 @@ void tst_Favicon::requestIconForPageURL()
 
     page->load(QUrl("qrc:/resources/favicon-misc.html"));
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-    QTRY_COMPARE(iconChangedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+    QTRY_COMPARE(iconChangedSpy.size(), 1);
 
     page->load(QUrl("about:blank"));
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 2);
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 2);
-    QTRY_COMPARE(iconChangedSpy.count(), 2);
+    QTRY_COMPARE(loadFinishedSpy.size(), 2);
+    QTRY_COMPARE(iconUrlChangedSpy.size(), 2);
+    QTRY_COMPARE(iconChangedSpy.size(), 2);
     QVERIFY(page->icon().isNull());
     QVERIFY(page->iconUrl().isEmpty());
 
@@ -770,15 +770,15 @@ void tst_Favicon::desiredSize()
 
         page->load(QUrl("qrc:/resources/favicon-multi.html"));
 
-        QTRY_COMPARE(loadFinishedSpy.count(), 1);
-        QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-        QTRY_COMPARE(iconChangedSpy.count(), 1);
+        QTRY_COMPARE(loadFinishedSpy.size(), 1);
+        QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+        QTRY_COMPARE(iconChangedSpy.size(), 1);
 
         page->load(QUrl("about:blank"));
 
-        QTRY_COMPARE(loadFinishedSpy.count(), 2);
-        QTRY_COMPARE(iconUrlChangedSpy.count(), 2);
-        QTRY_COMPARE(iconChangedSpy.count(), 2);
+        QTRY_COMPARE(loadFinishedSpy.size(), 2);
+        QTRY_COMPARE(iconUrlChangedSpy.size(), 2);
+        QTRY_COMPARE(iconChangedSpy.size(), 2);
         QVERIFY(page->icon().isNull());
         QVERIFY(page->iconUrl().isEmpty());
     }
@@ -813,15 +813,15 @@ void tst_Favicon::desiredSize()
 
         page->load(QUrl("qrc:/resources/favicon-multi.html"));
 
-        QTRY_COMPARE(loadFinishedSpy.count(), 1);
-        QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
-        QTRY_COMPARE(iconChangedSpy.count(), 1);
+        QTRY_COMPARE(loadFinishedSpy.size(), 1);
+        QTRY_COMPARE(iconUrlChangedSpy.size(), 1);
+        QTRY_COMPARE(iconChangedSpy.size(), 1);
 
         page->load(QUrl("about:blank"));
 
-        QTRY_COMPARE(loadFinishedSpy.count(), 2);
-        QTRY_COMPARE(iconUrlChangedSpy.count(), 2);
-        QTRY_COMPARE(iconChangedSpy.count(), 2);
+        QTRY_COMPARE(loadFinishedSpy.size(), 2);
+        QTRY_COMPARE(iconUrlChangedSpy.size(), 2);
+        QTRY_COMPARE(iconChangedSpy.size(), 2);
         QVERIFY(page->icon().isNull());
         QVERIFY(page->iconUrl().isEmpty());
     }
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 9f196972d..6140b3766 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -111,7 +111,7 @@ void tst_LoadSignals::init()
     if (!view.url().isEmpty()) {
         loadFinishedSpy.clear();
         view.load(QUrl("about:blank"));
-        QTRY_COMPARE(loadFinishedSpy.count(), 1);
+        QTRY_COMPARE(loadFinishedSpy.size(), 1);
     }
     resetSpies();
     page.reset();
@@ -421,11 +421,11 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
         ? server->url("/not-found-page.html")
         : QUrl(rfcInvalid ? "http://some.invalid" : "http://non.existent/url");
     view.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 20000);
     QVERIFY(!loadFinishedSpy.at(0).at(0).toBool());
     QCOMPARE(toPlainTextSync(view.page()), QString());
-    QCOMPARE(loadFinishedSpy.count(), 1);
-    QCOMPARE(loadStartedSpy.count(), 1);
+    QCOMPARE(loadFinishedSpy.size(), 1);
+    QCOMPARE(loadStartedSpy.size(), 1);
     QVERIFY(std::is_sorted(page.loadProgress.begin(), page.loadProgress.end()));
     page.loadProgress.clear();
 
@@ -447,13 +447,13 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
         ? server->url("/another-missing-one.html")
         : QUrl(rfcInvalid ? "http://some.other.invalid" : "http://another.non.existent/url");
     view.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 2, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 2, 20000);
     QVERIFY(!loadFinishedSpy.at(1).at(0).toBool());
-    QCOMPARE(loadStartedSpy.count(), 2);
+    QCOMPARE(loadStartedSpy.size(), 2);
 
     QEXPECT_FAIL("", "No more loads (like separate load for error pages) are expected", Continue);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 3, 1000);
-    QCOMPARE(loadStartedSpy.count(), 2);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 3, 1000);
+    QCOMPARE(loadStartedSpy.size(), 2);
     QVERIFY(std::is_sorted(page.loadProgress.begin(), page.loadProgress.end()));
 
     { auto &&loadStart = page.loadingInfos[2], &&loadFinish = page.loadingInfos[3];
@@ -488,7 +488,7 @@ void tst_LoadSignals::errorPageTriggered()
     HttpServer server;
     connect(&server, &HttpServer::newRequest, [] (HttpReqRep *rr) {
         QList<QByteArray> parts = rr->requestPath().split('/');
-        if (parts.length() != 3) {
+        if (parts.size() != 3) {
             // For example, /favicon.ico
             rr->sendResponse(404);
             return;
diff --git a/tests/auto/widgets/offscreen/tst_offscreen.cpp b/tests/auto/widgets/offscreen/tst_offscreen.cpp
index 9553a0394..553dc653b 100644
--- a/tests/auto/widgets/offscreen/tst_offscreen.cpp
+++ b/tests/auto/widgets/offscreen/tst_offscreen.cpp
@@ -26,7 +26,7 @@ void tst_OffScreen::offscreen()
     page.load(QUrl("qrc:/test.html"));
     view.show();
     QTRY_COMPARE(view.isVisible(), true);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count() > 0, true, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size() > 0, true, 20000);
     QCOMPARE(loadFinishedSpy.takeFirst().at(0).toBool(), true);
 }
 
diff --git a/tests/auto/widgets/printing/tst_printing.cpp b/tests/auto/widgets/printing/tst_printing.cpp
index 2e04bc03c..1c1e0615e 100644
--- a/tests/auto/widgets/printing/tst_printing.cpp
+++ b/tests/auto/widgets/printing/tst_printing.cpp
@@ -32,13 +32,13 @@ void tst_Printing::printToPdfBasic()
     QWebEngineView view;
     QSignalSpy spy(&view, &QWebEngineView::loadFinished);
     view.load(QUrl("qrc:///resources/basic_printing_page.html"));
-    QTRY_VERIFY(spy.count() == 1);
+    QTRY_VERIFY(spy.size() == 1);
 
     QSignalSpy savePdfSpy(view.page(), &QWebEnginePage::pdfPrintingFinished);
     QPageLayout layout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0.0, 0.0, 0.0, 0.0));
     QString path = tempDir.path() + "/print_1_success.pdf";
     view.page()->printToPdf(path, layout);
-    QTRY_VERIFY2(savePdfSpy.count() == 1, "Printing to PDF file failed without signal");
+    QTRY_VERIFY2(savePdfSpy.size() == 1, "Printing to PDF file failed without signal");
 
     QList<QVariant> successArguments = savePdfSpy.takeFirst();
     QVERIFY2(successArguments.at(0).toString() == path, "File path for first saved PDF does not match arguments");
@@ -50,7 +50,7 @@ void tst_Printing::printToPdfBasic()
     path = tempDir.path() + "/print_|2_failed.pdf";
 #endif
     view.page()->printToPdf(path, QPageLayout());
-    QTRY_VERIFY2(savePdfSpy.count() == 1, "Printing to PDF file failed without signal");
+    QTRY_VERIFY2(savePdfSpy.size() == 1, "Printing to PDF file failed without signal");
 
     QList<QVariant> failedArguments = savePdfSpy.takeFirst();
     QVERIFY2(failedArguments.at(0).toString() == path, "File path for second saved PDF does not match arguments");
@@ -58,11 +58,11 @@ void tst_Printing::printToPdfBasic()
 
     CallbackSpy<QByteArray> successfulSpy;
     view.page()->printToPdf(successfulSpy.ref(), layout);
-    QVERIFY(successfulSpy.waitForResult().length() > 0);
+    QVERIFY(successfulSpy.waitForResult().size() > 0);
 
     CallbackSpy<QByteArray> failedInvalidLayoutSpy;
     view.page()->printToPdf(failedInvalidLayoutSpy.ref(), QPageLayout());
-    QCOMPARE(failedInvalidLayoutSpy.waitForResult().length(), 0);
+    QCOMPARE(failedInvalidLayoutSpy.waitForResult().size(), 0);
 }
 
 void tst_Printing::printRequest()
@@ -76,14 +76,14 @@ void tst_Printing::printRequest()
      CallbackSpy<QByteArray> resultSpy;
 
      view.load(QUrl("qrc:///resources/basic_printing_page.html"));
-     QTRY_VERIFY(loadFinishedSpy.count() == 1);
+     QTRY_VERIFY(loadFinishedSpy.size() == 1);
      view.page()->runJavaScript("window.print()");
-     QTRY_VERIFY(printRequestedSpy.count() == 1);
-     QVERIFY(printRequestedSpy2.count() == 1);
+     QTRY_VERIFY(printRequestedSpy.size() == 1);
+     QVERIFY(printRequestedSpy2.size() == 1);
      //check if printing still works
      view.printToPdf(resultSpy.ref(), layout);
      const QByteArray data = resultSpy.waitForResult();
-     QVERIFY(data.length() > 0);
+     QVERIFY(data.size() > 0);
 }
 
 #if QT_CONFIG(webengine_system_poppler)
diff --git a/tests/auto/widgets/proxy/tst_proxy.cpp b/tests/auto/widgets/proxy/tst_proxy.cpp
index 961d29303..f378ae22f 100644
--- a/tests/auto/widgets/proxy/tst_proxy.cpp
+++ b/tests/auto/widgets/proxy/tst_proxy.cpp
@@ -49,7 +49,7 @@ void tst_Proxy::proxyAuthentication()
     QWebEnginePage page;
     QSignalSpy successSpy(&server, &ProxyServer::authenticationSuccess);
     page.load(QUrl("http://www.qt.io"));
-    QTRY_VERIFY2(successSpy.count() > 0, "Could not get authentication token");
+    QTRY_VERIFY2(successSpy.size() > 0, "Could not get authentication token");
 }
 
 void tst_Proxy::forwardCookie()
@@ -69,7 +69,7 @@ void tst_Proxy::forwardCookie()
     page.setUrlRequestInterceptor(&interceptor);
     QSignalSpy cookieSpy(&server, &ProxyServer::cookieMatch);
     page.load(QUrl("http://www.qt.io"));
-    QTRY_VERIFY2(cookieSpy.count() > 0, "Could not get cookie");
+    QTRY_VERIFY2(cookieSpy.size() > 0, "Could not get cookie");
 }
 
 #include "tst_proxy.moc"
diff --git a/tests/auto/widgets/proxypac/tst_proxypac.cpp b/tests/auto/widgets/proxypac/tst_proxypac.cpp
index d372f77fa..afdccdea8 100644
--- a/tests/auto/widgets/proxypac/tst_proxypac.cpp
+++ b/tests/auto/widgets/proxypac/tst_proxypac.cpp
@@ -41,10 +41,10 @@ void tst_ProxyPac::proxypac()
 
     const bool v8_proxy_resolver_enabled = !fromEnv.contains("--single-process");
     page.load(QUrl("http://test.proxy1.com"));
-    QTRY_COMPARE(proxySpy1.count() >= 1, v8_proxy_resolver_enabled);
-    QVERIFY(proxySpy2.count() == 0);
+    QTRY_COMPARE(proxySpy1.size() >= 1, v8_proxy_resolver_enabled);
+    QVERIFY(proxySpy2.size() == 0);
     page.load(QUrl("http://test.proxy2.com"));
-    QTRY_COMPARE(proxySpy2.count() >= 1, v8_proxy_resolver_enabled);
+    QTRY_COMPARE(proxySpy2.size() >= 1, v8_proxy_resolver_enabled);
 
     // check for crash
     QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
diff --git a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
index 5e4865003..1c2268b31 100644
--- a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
+++ b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
@@ -108,8 +108,8 @@ void tst_QWebEngineDownloadRequest::cleanup()
     for (QWebEngineDownloadRequest *item : m_finishedDownloads) {
         item->deleteLater();
     }
-    QTRY_COMPARE(m_requestedDownloads.count(), 0);
-    QCOMPARE(m_finishedDownloads.count(), 0);
+    QTRY_COMPARE(m_requestedDownloads.size(), 0);
+    QCOMPARE(m_finishedDownloads.size(), 0);
     QVERIFY(m_server->stop());
     // Set download path to default.
     m_profile->setDownloadPath("");
@@ -139,7 +139,7 @@ void tst_QWebEngineDownloadRequest::saveLink(QPoint linkPos)
     QCoreApplication::postEvent(renderWidget, event1);
     QCoreApplication::postEvent(renderWidget, event2);
     QCoreApplication::postEvent(renderWidget, event3);
-    QTRY_COMPARE(menuSpy.count(), 1);
+    QTRY_COMPARE(menuSpy.size(), 1);
     m_page->triggerAction(QWebEnginePage::DownloadLinkToDisk);
 }
 
@@ -453,7 +453,7 @@ void tst_QWebEngineDownloadRequest::downloadLink()
     // attribute or not.
     QSignalSpy loadSpy(m_page, &QWebEnginePage::loadFinished);
     m_view->load(m_server->url());
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
     QCOMPARE(indexRequestCount, 1);
 
@@ -461,7 +461,7 @@ void tst_QWebEngineDownloadRequest::downloadLink()
 
     // If file is expected to be displayed and not downloaded then end test
     if (fileAction == FileIsDisplayed) {
-        QTRY_COMPARE(loadSpy.count(), 1);
+        QTRY_COMPARE(loadSpy.size(), 1);
         QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
         QCOMPARE(acceptedCount, 0);
         return;
@@ -551,7 +551,7 @@ void tst_QWebEngineDownloadRequest::downloadTwoLinks()
 
     QSignalSpy loadSpy(m_page, &QWebEnginePage::loadFinished);
     m_view->load(m_server->url());
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
 
     // Trigger downloads
@@ -643,7 +643,7 @@ void tst_QWebEngineDownloadRequest::downloadPage()
     // Load some HTML
     QSignalSpy loadSpy(m_page, &QWebEnginePage::loadFinished);
     m_page->load(m_server->url());
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
     QCOMPARE(indexRequestCount, 1);
 
@@ -688,8 +688,8 @@ void tst_QWebEngineDownloadRequest::downloadViaSetUrl()
     QSignalSpy urlSpy(m_page, &QWebEnginePage::urlChanged);
     const QUrl indexUrl = m_server->url();
     m_page->setUrl(indexUrl);
-    QTRY_COMPARE(loadSpy.count(), 1);
-    QTRY_COMPARE(urlSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
+    QTRY_COMPARE(urlSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
     QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), indexUrl);
 
@@ -699,9 +699,9 @@ void tst_QWebEngineDownloadRequest::downloadViaSetUrl()
     for (int i = 0; i != 3; ++i) {
         m_page->setUrl(fileUrl);
         QCOMPARE(m_page->url(), fileUrl);
-        QTRY_COMPARE(loadSpy.count(), 1);
-        QTRY_COMPARE(urlSpy.count(), 2);
-        QTRY_COMPARE(downloadUrls.count(), 1);
+        QTRY_COMPARE(loadSpy.size(), 1);
+        QTRY_COMPARE(urlSpy.size(), 2);
+        QTRY_COMPARE(downloadUrls.size(), 1);
         QCOMPARE(loadSpy.takeFirst().value(0).toBool(), false);
         QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), fileUrl);
         QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), indexUrl);
@@ -1132,21 +1132,21 @@ void tst_QWebEngineDownloadRequest::downloadToDirectoryWithFileName()
             const QString &originalFileName = item->downloadFileName();
             item->setDownloadDirectory(downloadDirectory);
             QCOMPARE(item->downloadDirectory(), downloadDirectory);
-            QCOMPARE(directorySpy.count(), 1);
+            QCOMPARE(directorySpy.size(), 1);
             isUniquifiedFileName = (originalFileName != item->downloadFileName());
-            QCOMPARE(fileNameSpy.count(), isUniquifiedFileName ? 1 : 0);
+            QCOMPARE(fileNameSpy.size(), isUniquifiedFileName ? 1 : 0);
         }
 
         if (!downloadFileName.isEmpty()) {
             item->setDownloadFileName(downloadFileName);
             QCOMPARE(item->downloadFileName(), downloadFileName);
-            QCOMPARE(fileNameSpy.count(), isUniquifiedFileName ? 2 : 1);
+            QCOMPARE(fileNameSpy.size(), isUniquifiedFileName ? 2 : 1);
         }
 
         if (!downloadDirectory.isEmpty() && !setDirectoryFirst) {
             item->setDownloadDirectory(downloadDirectory);
             QCOMPARE(item->downloadDirectory(), downloadDirectory);
-            QCOMPARE(directorySpy.count(), 1);
+            QCOMPARE(directorySpy.size(), 1);
         }
 
         item->accept();
@@ -1274,7 +1274,7 @@ void tst_QWebEngineDownloadRequest::downloadDataUrls()
 
     QSignalSpy loadSpy(m_page, &QWebEnginePage::loadFinished);
     m_view->load(m_server->url());
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
 
     // Trigger download
diff --git a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp
index f67c2e03d..9589e83e1 100644
--- a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp
+++ b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp
@@ -39,7 +39,7 @@ protected :
     {
         loadFinishedSpy->clear();
         page->load(QUrl("qrc:/resources/page" + QString::number(nr) + ".html"));
-        QTRY_COMPARE(loadFinishedSpy->count(), 1);
+        QTRY_COMPARE(loadFinishedSpy->size(), 1);
         loadFinishedSpy->clear();
     }
 
@@ -150,8 +150,8 @@ void tst_QWebEngineHistory::back()
     for (int i = histsize;i > 1;i--) {
         QTRY_COMPARE(toPlainTextSync(page), QString("page") + QString::number(i));
         hist->back();
-        QTRY_COMPARE(loadFinishedSpy->count(), histsize-i+1);
-        QTRY_COMPARE(titleChangedSpy.count(), histsize-i+1);
+        QTRY_COMPARE(loadFinishedSpy->size(), histsize-i+1);
+        QTRY_COMPARE(titleChangedSpy.size(), histsize-i+1);
     }
     //try one more time (too many). crash test
     hist->back();
@@ -168,15 +168,15 @@ void tst_QWebEngineHistory::forward()
     while (hist->canGoBack()) {
         hist->back();
         histBackCount++;
-        QTRY_COMPARE(loadFinishedSpy->count(), histBackCount);
+        QTRY_COMPARE(loadFinishedSpy->size(), histBackCount);
     }
 
     QSignalSpy titleChangedSpy(page, SIGNAL(titleChanged(const QString&)));
     for (int i = 1;i < histsize;i++) {
         QTRY_COMPARE(toPlainTextSync(page), QString("page") + QString::number(i));
         hist->forward();
-        QTRY_COMPARE(loadFinishedSpy->count(), i+histBackCount);
-        QTRY_COMPARE(titleChangedSpy.count(), i);
+        QTRY_COMPARE(loadFinishedSpy->size(), i+histBackCount);
+        QTRY_COMPARE(titleChangedSpy.size(), i);
     }
     //try one more time (too many). crash test
     hist->forward();
@@ -205,15 +205,15 @@ void tst_QWebEngineHistory::goToItem()
     QWebEngineHistoryItem current = hist->currentItem();
 
     hist->back();
-    QTRY_COMPARE(loadFinishedSpy->count(), 1);
+    QTRY_COMPARE(loadFinishedSpy->size(), 1);
 
     hist->back();
-    QTRY_COMPARE(loadFinishedSpy->count(), 2);
+    QTRY_COMPARE(loadFinishedSpy->size(), 2);
 
     QVERIFY(hist->currentItem().title() != current.title());
 
     hist->goToItem(current);
-    QTRY_COMPARE(loadFinishedSpy->count(), 2);
+    QTRY_COMPARE(loadFinishedSpy->size(), 2);
 
     QTRY_COMPARE(hist->currentItem().title(), current.title());
 }
@@ -225,7 +225,7 @@ void tst_QWebEngineHistory::items()
 {
     QList<QWebEngineHistoryItem> items = hist->items();
     //check count
-    QTRY_COMPARE(histsize, items.count());
+    QTRY_COMPARE(histsize, items.size());
 
     //check order
     for (int i = 1;i <= histsize;i++) {
@@ -236,10 +236,10 @@ void tst_QWebEngineHistory::items()
 void tst_QWebEngineHistory::backForwardItems()
 {
     hist->back();
-    QTRY_COMPARE(loadFinishedSpy->count(), 1);
+    QTRY_COMPARE(loadFinishedSpy->size(), 1);
 
     hist->back();
-    QTRY_COMPARE(loadFinishedSpy->count(), 2);
+    QTRY_COMPARE(loadFinishedSpy->size(), 2);
 
     QTRY_COMPARE(hist->items().size(), 5);
     QTRY_COMPARE(hist->backItems(100).size(), 2);
@@ -297,9 +297,9 @@ void tst_QWebEngineHistory::serialize_2()
     hist->back();
     QTRY_VERIFY(evaluateJavaScriptSync(page, "location.hash").toString().isEmpty());
     hist->back();
-    QTRY_COMPARE(loadFinishedSpy->count(), 1);
+    QTRY_COMPARE(loadFinishedSpy->size(), 1);
     hist->back();
-    QTRY_COMPARE(loadFinishedSpy->count(), 2);
+    QTRY_COMPARE(loadFinishedSpy->size(), 2);
     //check if current index was changed (make sure that it is not last item)
     QVERIFY(hist->currentItemIndex() != initialCurrentIndex);
     //save current index
@@ -310,18 +310,18 @@ void tst_QWebEngineHistory::serialize_2()
     load >> *hist;
     QVERIFY(load.status() == QDataStream::Ok);
     // Restoring the history will trigger a load.
-    QTRY_COMPARE(loadFinishedSpy->count(), 3);
+    QTRY_COMPARE(loadFinishedSpy->size(), 3);
 
     //check current index
     QTRY_COMPARE(hist->currentItemIndex(), oldCurrentIndex);
 
     hist->forward();
-    QTRY_COMPARE(loadFinishedSpy->count(), 4);
+    QTRY_COMPARE(loadFinishedSpy->size(), 4);
     hist->forward();
-    QTRY_COMPARE(loadFinishedSpy->count(), 5);
+    QTRY_COMPARE(loadFinishedSpy->size(), 5);
     hist->forward();
     // In-page navigation, the last url was the page5.html
-    QTRY_COMPARE(loadFinishedSpy->count(), 5);
+    QTRY_COMPARE(loadFinishedSpy->size(), 5);
     QTRY_COMPARE(hist->currentItemIndex(), initialCurrentIndex);
 }
 
@@ -429,7 +429,7 @@ void tst_QWebEngineHistory::saveAndRestore_crash_4()
     QSignalSpy loadFinishedSpy2(page2.data(), SIGNAL(loadFinished(bool)));
     QDataStream load(&buffer, QIODevice::ReadOnly);
     load >> *page2->history();
-    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy2.size(), 1);
 }
 
 void tst_QWebEngineHistory::saveAndRestore_InternalPage()
@@ -468,7 +468,7 @@ void tst_QWebEngineHistory::popPushState()
     QWebEnginePage page;
     QSignalSpy spyLoadFinished(&page, SIGNAL(loadFinished(bool)));
     page.setHtml("<html><body>long live Qt!</body></html>");
-    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QTRY_COMPARE(spyLoadFinished.size(), 1);
     evaluateJavaScriptSync(&page, script);
 }
 
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 853297ff0..cbb63289f 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -76,7 +76,7 @@ static void removeRecursive(const QString& dirname)
 {
     QDir dir(dirname);
     QFileInfoList entries(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot));
-    for (int i = 0; i < entries.count(); ++i)
+    for (int i = 0; i < entries.size(); ++i)
         if (entries[i].isDir())
             removeRecursive(entries[i].filePath());
         else
@@ -394,15 +394,15 @@ void tst_QWebEnginePage::acceptNavigationRequest()
     page.setHtml(QString("<html><body><form name='tstform' action='foo' method='get'>"
                             "<input type='text'><input type='submit'></form></body></html>"),
                  QUrl("echo:/"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
 
     evaluateJavaScriptSync(&page, "tstform.submit();");
-    QTRY_COMPARE(loadSpy.count(), 2);
+    QTRY_COMPARE(loadSpy.size(), 2);
 
     // Content hasn't changed so the form submit will still work
     page.m_acceptNavigationRequest = true;
     evaluateJavaScriptSync(&page, "tstform.submit();");
-    QTRY_COMPARE(loadSpy.count(), 3);
+    QTRY_COMPARE(loadSpy.size(), 3);
 
     // Now the content has changed
     QCOMPARE(toPlainTextSync(&page), QString("/foo?"));
@@ -460,7 +460,7 @@ void tst_QWebEnginePage::geolocationRequestJS()
 
     QSignalSpy spyLoadFinished(newPage, SIGNAL(loadFinished(bool)));
     newPage->setHtml(QString("<html><body>test</body></html>"), QUrl("qrc://secure/origin"));
-    QTRY_COMPARE_WITH_TIMEOUT(spyLoadFinished.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spyLoadFinished.size(), 1, 20000);
 
     // Geolocation is only enabled for visible WebContents.
     view.show();
@@ -487,19 +487,19 @@ void tst_QWebEnginePage::loadFinished()
     page.load(QUrl("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"
                                            "<head><meta http-equiv='refresh' content='1'></head>foo \">"
                                            "<frame src=\"data:text/html,bar\"></frameset>"));
-    QTRY_COMPARE_WITH_TIMEOUT(spyLoadFinished.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spyLoadFinished.size(), 1, 20000);
 
     QEXPECT_FAIL("", "Behavior change: Load signals are emitted only for the main frame in QtWebEngine.", Continue);
-    QTRY_VERIFY_WITH_TIMEOUT(spyLoadStarted.count() > 1, 100);
+    QTRY_VERIFY_WITH_TIMEOUT(spyLoadStarted.size() > 1, 100);
     QEXPECT_FAIL("", "Behavior change: Load signals are emitted only for the main frame in QtWebEngine.", Continue);
-    QTRY_VERIFY_WITH_TIMEOUT(spyLoadFinished.count() > 1, 100);
+    QTRY_VERIFY_WITH_TIMEOUT(spyLoadFinished.size() > 1, 100);
 
     spyLoadFinished.clear();
 
     page.load(QUrl("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"
                                            "foo \"><frame src=\"data:text/html,bar\"></frameset>"));
-    QTRY_COMPARE(spyLoadFinished.count(), 1);
-    QCOMPARE(spyLoadFinished.count(), 1);
+    QTRY_COMPARE(spyLoadFinished.size(), 1);
+    QCOMPARE(spyLoadFinished.size(), 1);
 }
 
 void tst_QWebEnginePage::actionStates()
@@ -586,7 +586,7 @@ void tst_QWebEnginePage::consoleOutput()
     ConsolePage page;
     // We don't care about the result but want this to be synchronous
     evaluateJavaScriptSync(&page, "this is not valid JavaScript");
-    QCOMPARE(page.messages.count(), 1);
+    QCOMPARE(page.messages.size(), 1);
     QCOMPARE(page.lineNumbers.at(0), 1);
 }
 
@@ -645,27 +645,27 @@ void tst_QWebEnginePage::acceptNavigationRequestNavigationType()
     QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
 
     page.load(QUrl("qrc:///resources/script.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
-    QTRY_COMPARE(page.navigations.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
+    QTRY_COMPARE(page.navigations.size(), 1);
 
     page.load(QUrl("qrc:///resources/content.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 20000);
-    QTRY_COMPARE(page.navigations.count(), 2);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 2, 20000);
+    QTRY_COMPARE(page.navigations.size(), 2);
 
     page.triggerAction(QWebEnginePage::Stop);
     QVERIFY(page.history()->canGoBack());
     page.triggerAction(QWebEnginePage::Back);
 
-    QTRY_COMPARE(loadSpy.count(), 3);
-    QTRY_COMPARE(page.navigations.count(), 3);
+    QTRY_COMPARE(loadSpy.size(), 3);
+    QTRY_COMPARE(page.navigations.size(), 3);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy.count(), 4);
-    QTRY_COMPARE(page.navigations.count(), 4);
+    QTRY_COMPARE(loadSpy.size(), 4);
+    QTRY_COMPARE(page.navigations.size(), 4);
 
     page.load(QUrl("qrc:///resources/reload.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 6, 20000);
-    QTRY_COMPARE(page.navigations.count(), 6);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 6, 20000);
+    QTRY_COMPARE(page.navigations.size(), 6);
 
     QList<QWebEngineNavigationRequest::NavigationType> expectedList;
     expectedList << QWebEngineNavigationRequest::TypedNavigation
@@ -677,8 +677,8 @@ void tst_QWebEnginePage::acceptNavigationRequestNavigationType()
 
     // client side redirect
     page.load(QUrl("qrc:///resources/redirect.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 7, 20000);
-    QTRY_COMPARE(page.navigations.count(), 8);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 7, 20000);
+    QTRY_COMPARE(page.navigations.size(), 8);
     expectedList += { QWebEngineNavigationRequest::TypedNavigation, QWebEngineNavigationRequest::RedirectNavigation };
 
     // server side redirect
@@ -699,18 +699,18 @@ void tst_QWebEnginePage::acceptNavigationRequestNavigationType()
     });
     QVERIFY(server.start());
     page.load(QUrl(server.url("/redirect1.html")));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 8, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 8, 20000);
     expectedList += {
         QWebEngineNavigationRequest::TypedNavigation,
         QWebEngineNavigationRequest::RedirectNavigation,
         QWebEngineNavigationRequest::RedirectNavigation
     };
 
-    for (int i = 0; i < expectedList.count(); ++i) {
-        QTRY_VERIFY(i < page.navigations.count());
+    for (int i = 0; i < expectedList.size(); ++i) {
+        QTRY_VERIFY(i < page.navigations.size());
         QCOMPARE(page.navigations[i].type, expectedList[i]);
     }
-    QVERIFY(expectedList.count() == page.navigations.count());
+    QVERIFY(expectedList.size() == page.navigations.size());
 }
 
 // Relative url without base url.
@@ -723,18 +723,18 @@ void tst_QWebEnginePage::acceptNavigationRequestRelativeToNothing()
 
     page.setHtml(QString("<html><body><a id='link' href='S0'>limited time offer</a></body></html>"),
                  /* baseUrl: */ QUrl());
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
     page.runJavaScript(QStringLiteral("document.getElementById(\"link\").click()"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 2, 20000);
     page.setHtml(QString("<html><body><a id='link' href='S0'>limited time offer</a></body></html>"),
                  /* baseUrl: */ QString("qrc:/"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 3, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 3, 20000);
     page.runJavaScript(QStringLiteral("document.getElementById(\"link\").click()"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 4, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 4, 20000);
 
     // The two setHtml and the second click are counted, while the
     // first click is ignored due to the empty base url.
-    QCOMPARE(page.navigations.count(), 3);
+    QCOMPARE(page.navigations.size(), 3);
     QCOMPARE(page.navigations[0].type, QWebEngineNavigationRequest::TypedNavigation);
     QCOMPARE(page.navigations[1].type, QWebEngineNavigationRequest::TypedNavigation);
     QCOMPARE(page.navigations[2].type, QWebEngineNavigationRequest::LinkClickedNavigation);
@@ -753,11 +753,11 @@ void tst_QWebEnginePage::popupFormSubmission()
     page.setHtml("<form name='form1' method=get action='' target='myNewWin'>"
                  "  <input type='hidden' name='foo' value='bar'>"
                  "</form>", QUrl("echo:"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 20000);
 
     page.runJavaScript("window.open('', 'myNewWin', 'width=500,height=300,toolbar=0');");
     evaluateJavaScriptSync(&page, "document.form1.submit();");
-    QTRY_COMPARE(windowCreatedSpy.count(), 1);
+    QTRY_COMPARE(windowCreatedSpy.size(), 1);
 
     // The number of popup created should be one.
     QVERIFY(page.createdWindows.size() == 1);
@@ -806,16 +806,16 @@ void tst_QWebEnginePage::multipleProfilesAndLocalStorage()
 
         page1.setHtml(QString("<html><body> </body></html>"), QUrl("http://wwww.example.com"));
         page2.setHtml(QString("<html><body> </body></html>"), QUrl("http://wwww.example.com"));
-        QTRY_COMPARE_WITH_TIMEOUT(loadSpy1.count(), 1, 20000);
-        QTRY_COMPARE_WITH_TIMEOUT(loadSpy2.count(), 1, 20000);
+        QTRY_COMPARE_WITH_TIMEOUT(loadSpy1.size(), 1, 20000);
+        QTRY_COMPARE_WITH_TIMEOUT(loadSpy2.size(), 1, 20000);
 
         evaluateJavaScriptSync(&page1, "localStorage.setItem('test', 'value1');");
         evaluateJavaScriptSync(&page2, "localStorage.setItem('test', 'value2');");
 
         page1.setHtml(QString("<html><body> </body></html>"), QUrl("http://wwww.example.com"));
         page2.setHtml(QString("<html><body> </body></html>"), QUrl("http://wwww.example.com"));
-        QTRY_COMPARE(loadSpy1.count(), 2);
-        QTRY_COMPARE(loadSpy2.count(), 2);
+        QTRY_COMPARE(loadSpy1.size(), 2);
+        QTRY_COMPARE(loadSpy2.size(), 2);
 
         QVariant s1 = evaluateJavaScriptSync(&page1, "localStorage.getItem('test')");
         QCOMPARE(s1.toString(), QString("value1"));
@@ -864,7 +864,7 @@ void tst_QWebEnginePage::textSelection()
 
     QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(content);
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
 
     // these actions must exist
     QVERIFY(page.action(QWebEnginePage::SelectAll) != 0);
@@ -891,7 +891,7 @@ void tst_QWebEnginePage::textSelection()
 
     // navigate away and check that selection is cleared
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE(loadSpy.count(), 2);
+    QTRY_COMPARE(loadSpy.size(), 2);
 
     QVERIFY(!page.hasSelection());
     QVERIFY(page.selectedText().isEmpty());
@@ -912,7 +912,7 @@ void tst_QWebEnginePage::backActionUpdate()
     QVERIFY(!action->isEnabled());
 
     page->load(QUrl("qrc:///resources/framedindex.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
     QVERIFY(!action->isEnabled());
 
     auto firstAnchorCenterInFrame = [](QWebEnginePage *page, const QString &frameName) {
@@ -924,7 +924,7 @@ void tst_QWebEnginePage::backActionUpdate()
             "return [(rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2];"
         "})()").toList();
 
-        if (rectList.count() != 2) {
+        if (rectList.size() != 2) {
             qWarning("firstAnchorCenterInFrame failed.");
             return QPoint();
         }
@@ -951,8 +951,8 @@ void tst_QWebEnginePage::localStorageVisibility()
     QSignalSpy loadSpy2(&webPage2, &QWebEnginePage::loadFinished);
     webPage1.setHtml(QString("<html><body>test</body></html>"), QUrl("http://www.example.com/"));
     webPage2.setHtml(QString("<html><body>test</body></html>"), QUrl("http://www.example.com/"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy1.count(), 1, 20000);
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy2.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy1.size(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy2.size(), 1, 20000);
 
     // The attribute determines the visibility of the window.localStorage object.
     QVERIFY(evaluateJavaScriptSync(&webPage1, QString("(window.localStorage != undefined)")).toBool());
@@ -971,8 +971,8 @@ void tst_QWebEnginePage::localStorageVisibility()
     // The object disappears only after reloading.
     webPage1.triggerAction(QWebEnginePage::Reload);
     webPage2.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy1.count(), 2);
-    QTRY_COMPARE(loadSpy2.count(), 2);
+    QTRY_COMPARE(loadSpy1.size(), 2);
+    QTRY_COMPARE(loadSpy2.size(), 2);
     QVERIFY(!evaluateJavaScriptSync(&webPage1, QString("(window.localStorage != undefined)")).toBool());
     QVERIFY(evaluateJavaScriptSync(&webPage2, QString("(window.localStorage != undefined)")).toBool());
 }
@@ -1073,7 +1073,7 @@ void tst_QWebEnginePage::testJSPrompt()
     bool res;
     QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><body></body></html>"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
 
     // OK + QString()
     res = evaluateJavaScriptSync(&page,
@@ -1107,7 +1107,7 @@ void tst_QWebEnginePage::findText()
 
     // Showing is required, otherwise all find operations fail.
     m_view->show();
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     // Select whole page contents.
     QTRY_VERIFY(m_view->page()->action(QWebEnginePage::SelectAll)->isEnabled());
@@ -1121,7 +1121,7 @@ void tst_QWebEnginePage::findText()
         QSignalSpy signalSpy(m_view->page(), &QWebEnginePage::findTextFinished);
         m_view->findText("", {}, callbackSpy.ref());
         QVERIFY(callbackSpy.wasCalled());
-        QCOMPARE(signalSpy.count(), 1);
+        QCOMPARE(signalSpy.size(), 1);
         QTRY_COMPARE(m_view->selectedText(), QString("foo bar"));
     }
 
@@ -1132,7 +1132,7 @@ void tst_QWebEnginePage::findText()
         QSignalSpy signalSpy(m_view->page(), &QWebEnginePage::findTextFinished);
         m_view->findText("Will not be found", {}, callbackSpy.ref());
         QCOMPARE(callbackSpy.waitForResult().numberOfMatches(), 0);
-        QTRY_COMPARE(signalSpy.count(), 1);
+        QTRY_COMPARE(signalSpy.size(), 1);
         auto result = signalSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
         QCOMPARE(result.numberOfMatches(), 0);
         QTRY_VERIFY(m_view->selectedText().isEmpty());
@@ -1149,7 +1149,7 @@ void tst_QWebEnginePage::findText()
         QSignalSpy signalSpy(m_view->page(), &QWebEnginePage::findTextFinished);
         m_view->findText("foo", {}, callbackSpy.ref());
         QVERIFY(callbackSpy.waitForResult().numberOfMatches() > 0);
-        QTRY_COMPARE(signalSpy.count(), 1);
+        QTRY_COMPARE(signalSpy.size(), 1);
         QTRY_VERIFY(m_view->selectedText().isEmpty());
     }
 
@@ -1160,7 +1160,7 @@ void tst_QWebEnginePage::findText()
         QSignalSpy signalSpy(m_view->page(), &QWebEnginePage::findTextFinished);
         m_view->findText("", {}, callbackSpy.ref());
         QTRY_VERIFY(callbackSpy.wasCalled());
-        QTRY_COMPARE(signalSpy.count(), 1);
+        QTRY_COMPARE(signalSpy.size(), 1);
         QTRY_COMPARE(m_view->selectedText(), QString("foo"));
     }
 
@@ -1170,7 +1170,7 @@ void tst_QWebEnginePage::findText()
         QSignalSpy signalSpy(m_view->page(), &QWebEnginePage::findTextFinished);
         m_view->findText("foo", {});
         m_view->findText("foo", {});
-        QTRY_COMPARE(signalSpy.count(), 2);
+        QTRY_COMPARE(signalSpy.size(), 2);
         QTRY_VERIFY(m_view->selectedText().isEmpty());
 
         QCOMPARE(signalSpy.at(0).value(0).value<QWebEngineFindTextResult>().numberOfMatches(), 0);
@@ -1182,7 +1182,7 @@ void tst_QWebEnginePage::findTextResult()
 {
     QSignalSpy findTextSpy(m_view->page(), &QWebEnginePage::findTextFinished);
     auto signalResult = [&findTextSpy]() -> QList<int> {
-        if (findTextSpy.count() != 1)
+        if (findTextSpy.size() != 1)
             return QList<int>({-1, -1});
         auto r = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
         return QList<int>({ r.numberOfMatches(), r.activeMatch() });
@@ -1194,7 +1194,7 @@ void tst_QWebEnginePage::findTextResult()
 
     QSignalSpy loadSpy(m_view, SIGNAL(loadFinished(bool)));
     m_view->setHtml(QString("<html><head></head><body><div>foo bar</div></body></html>"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QCOMPARE(findTextSync(m_page, ""), false);
     QCOMPARE(signalResult(), QList<int>({0, 0}));
@@ -1223,7 +1223,7 @@ void tst_QWebEnginePage::findTextSuccessiveShouldCallAllCallbacks()
     CallbackSpy<QWebEngineFindTextResult> spy5;
     QSignalSpy loadSpy(m_view, SIGNAL(loadFinished(bool)));
     m_view->setHtml(QString("<html><head></head><body><div>abcdefg abcdefg abcdefg abcdefg abcdefg</div></body></html>"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
     m_page->findText("abcde", {}, spy1.ref());
     m_page->findText("abcd", {}, spy2.ref());
     m_page->findText("abc", {}, spy3.ref());
@@ -1245,7 +1245,7 @@ void tst_QWebEnginePage::findTextCalledOnMatch()
     m_view->resize(800, 600);
     m_view->show();
     m_view->setHtml(QString("<html><head></head><body><div>foo bar</div></body></html>"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     // CALLBACK
     bool callbackCalled = false;
@@ -1282,12 +1282,12 @@ void tst_QWebEnginePage::findTextActiveMatchOrdinal()
     m_view->resize(800, 600);
     m_view->show();
     m_view->setHtml(QString("<html><head></head><body><div>foo bar foo bar foo</div></body></html>"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     // Iterate over all "foo" matches.
     for (int i = 1; i <= 3; ++i) {
         m_view->page()->findText("foo", {});
-        QTRY_COMPARE(findTextSpy.count(), 1);
+        QTRY_COMPARE(findTextSpy.size(), 1);
         result = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
         QCOMPARE(result.numberOfMatches(), 3);
         QCOMPARE(result.activeMatch(), i);
@@ -1295,28 +1295,28 @@ void tst_QWebEnginePage::findTextActiveMatchOrdinal()
 
     // The last match is followed by the fist one.
     m_view->page()->findText("foo", {});
-    QTRY_COMPARE(findTextSpy.count(), 1);
+    QTRY_COMPARE(findTextSpy.size(), 1);
     result = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
     QCOMPARE(result.numberOfMatches(), 3);
     QCOMPARE(result.activeMatch(), 1);
 
     // The first match is preceded by the last one.
     m_view->page()->findText("foo", QWebEnginePage::FindBackward);
-    QTRY_COMPARE(findTextSpy.count(), 1);
+    QTRY_COMPARE(findTextSpy.size(), 1);
     result = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
     QCOMPARE(result.numberOfMatches(), 3);
     QCOMPARE(result.activeMatch(), 3);
 
     // Finding another word resets the activeMatch.
     m_view->page()->findText("bar", {});
-    QTRY_COMPARE(findTextSpy.count(), 1);
+    QTRY_COMPARE(findTextSpy.size(), 1);
     result = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
     QCOMPARE(result.numberOfMatches(), 2);
     QCOMPARE(result.activeMatch(), 1);
 
     // If no match activeMatch is 0.
     m_view->page()->findText("bla", {});
-    QTRY_COMPARE(findTextSpy.count(), 1);
+    QTRY_COMPARE(findTextSpy.size(), 1);
     result = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
     QCOMPARE(result.numberOfMatches(), 0);
     QCOMPARE(result.activeMatch(), 0);
@@ -1353,7 +1353,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     view.setHtml(QLatin1String("<html><head></head><body><select id='foo'>"
                                "<option>fran</option><option>troz</option>"
                                "</select></body></html>"));
-    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QTRY_COMPARE(spyLoadFinished.size(), 1);
     const auto oldTlws = QGuiApplication::topLevelWindows();
     QFETCH(bool, withTouch);
     QWindow *window = view.windowHandle();
@@ -1375,7 +1375,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
         QLatin1String script("(function() { return [window.screenX, window.screenY]; })()");
         QVariantList posList = evaluateJavaScriptSync(view.page(), script).toList();
 
-        if (posList.count() != 2) {
+        if (posList.size() != 2) {
             qWarning("jsViewPosition failed.");
             return QPoint();
         }
@@ -1425,7 +1425,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
     view.setHtml(QLatin1String("<html><head></head><body><select autofocus id='foo'>"
                                "<option value=\"narf\">narf</option><option>zort</option>"
                                "</select></body></html>"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     const auto oldTlws = QGuiApplication::topLevelWindows();
 
     QFETCH(bool, withTouch);
@@ -1863,14 +1863,14 @@ void tst_QWebEnginePage::openWindowDefaultSize()
     page.settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
     view.setUrl(QUrl("about:blank"));
     view.show();
-    QTRY_COMPARE(spyFinished.count(), 1);
+    QTRY_COMPARE(spyFinished.size(), 1);
 
     // Open a default window.
     page.runJavaScript("window.open()");
-    QTRY_COMPARE(windowCreatedSpy.count(), 1);
+    QTRY_COMPARE(windowCreatedSpy.size(), 1);
     // Open a too small window.
     evaluateJavaScriptSync(&page, "window.open('','about:blank','width=10,height=10')");
-    QTRY_COMPARE(windowCreatedSpy.count(), 2);
+    QTRY_COMPARE(windowCreatedSpy.size(), 2);
 
     // The number of popups created should be two.
     QCOMPARE(page.createdWindows.size(), 2);
@@ -1941,7 +1941,7 @@ void tst_QWebEnginePage::runJavaScriptDisabled()
     // Settings changes take effect asynchronously. The load and wait ensure
     // that the settings are applied by the time we start to execute JavaScript.
     page.load(QStringLiteral("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 20000);
     QCOMPARE(evaluateJavaScriptSyncInWorld(&page, QStringLiteral("1+1"), QWebEngineScript::MainWorld),
              QVariant());
     QCOMPARE(evaluateJavaScriptSyncInWorld(&page, QStringLiteral("1+1"), QWebEngineScript::ApplicationWorld),
@@ -1958,7 +1958,7 @@ void tst_QWebEnginePage::runJavaScriptFromSlot()
     page.setHtml("<html><body>"
                  "  <input type='text' id='input1' value='QtWebEngine' size='50' />"
                  "</body></html>");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     bool done = false;
     connect(&page, &QWebEnginePage::selectionChanged, [&]() {
@@ -1982,7 +1982,7 @@ void tst_QWebEnginePage::fullScreenRequested()
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     page->load(QUrl("qrc:///resources/fullscreen.html"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QTRY_VERIFY(isTrueJavaScriptResult(page, "document.webkitFullscreenEnabled"));
     QVERIFY(isFalseJavaScriptResult(page, "document.webkitIsFullScreen"));
@@ -1999,7 +1999,7 @@ void tst_QWebEnginePage::fullScreenRequested()
 
     QTest::mouseMove(view.windowHandle(), QPoint(10,10));
     QTest::mouseClick(view.windowHandle(), Qt::RightButton);
-    QTRY_COMPARE(view.findChildren<QMenu *>().count(), 1);
+    QTRY_COMPARE(view.findChildren<QMenu *>().size(), 1);
     auto menu = view.findChildren<QMenu *>().first();
     QVERIFY(menu->actions().contains(page->action(QWebEnginePage::ExitFullScreen)));
 
@@ -2035,21 +2035,21 @@ void tst_QWebEnginePage::quotaRequested()
         "navigator.webkitPersistentStorage.requestQuota(1024, function(grantedSize) {" \
             "console.log(grantedSize);" \
         "});");
-    QTRY_COMPARE(page.messages.count(), 1);
+    QTRY_COMPARE(page.messages.size(), 1);
     QTRY_COMPARE(page.messages[0], QString("1024"));
 
     evaluateJavaScriptSync(&page,
         "navigator.webkitPersistentStorage.requestQuota(6000, function(grantedSize) {" \
             "console.log(grantedSize);" \
         "});");
-    QTRY_COMPARE(page.messages.count(), 2);
+    QTRY_COMPARE(page.messages.size(), 2);
     QTRY_COMPARE(page.messages[1], QString("1024"));
 
     evaluateJavaScriptSync(&page,
         "navigator.webkitPersistentStorage.queryUsageAndQuota(function(usedBytes, grantedBytes) {" \
             "console.log(usedBytes + ', ' + grantedBytes);" \
         "});");
-    QTRY_COMPARE(page.messages.count(), 3);
+    QTRY_COMPARE(page.messages.size(), 3);
     QTRY_COMPARE(page.messages[2], QString("0, 1024"));
 }
 
@@ -2072,7 +2072,7 @@ void tst_QWebEnginePage::symmetricUrl()
     // loading is _not_ immediate, so the text isn't set just yet.
     QVERIFY(toPlainTextSync(view.page()).isEmpty());
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 20000);
 
     QCOMPARE(view.history()->count(), 1);
     QCOMPARE(toPlainTextSync(view.page()), QString("Test"));
@@ -2086,8 +2086,8 @@ void tst_QWebEnginePage::symmetricUrl()
     QCOMPARE(view.url(), dataUrl3);
 
     // setUrl(dataUrl3) might override the pending load for dataUrl2. Or not.
-    QTRY_VERIFY(loadFinishedSpy.count() >= 2);
-    QTRY_VERIFY(loadFinishedSpy.count() <= 3);
+    QTRY_VERIFY(loadFinishedSpy.size() >= 2);
+    QTRY_VERIFY(loadFinishedSpy.size() <= 3);
 
     // setUrl(dataUrl3) might stop Chromium from adding a navigation entry for dataUrl2,
     // depending on whether the load of dataUrl2 could be completed in time.
@@ -2246,7 +2246,7 @@ void tst_QWebEnginePage::requestedUrlAfterSetAndLoadFailures()
 
     const QUrl first("http://abcdef.abcdef/");
     page.setUrl(first);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 20000);
     QCOMPARE(page.url(), first);
     QCOMPARE(page.requestedUrl(), first);
     QVERIFY(!spy.at(0).first().toBool());
@@ -2255,7 +2255,7 @@ void tst_QWebEnginePage::requestedUrlAfterSetAndLoadFailures()
     QVERIFY(first != second);
 
     page.load(second);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 2, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 2, 20000);
     QCOMPARE(page.url(), first);
     QCOMPARE(page.requestedUrl(), second);
     QVERIFY(!spy.at(1).first().toBool());
@@ -2301,7 +2301,7 @@ void tst_QWebEnginePage::setHtmlWithImageResource()
 
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(html, QUrl("file:///path/to/file"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 12000);
 
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images.length").toInt(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].width").toInt(), 128);
@@ -2310,7 +2310,7 @@ void tst_QWebEnginePage::setHtmlWithImageResource()
     // Now we test the opposite: without a baseUrl as a local file, we can still request qrc resources.
 
     page.setHtml(html);
-    QTRY_COMPARE(spy.count(), 2);
+    QTRY_COMPARE(spy.size(), 2);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images.length").toInt(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].width").toInt(), 128);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].height").toInt(), 128);
@@ -2373,7 +2373,7 @@ void tst_QWebEnginePage::setHtmlWithBaseURL()
                          QString("%1/foo.html").arg(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath())));
     QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
     QVERIFY(spyFinished.wait());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images.length").toInt(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].width").toInt(), 128);
@@ -2436,7 +2436,7 @@ void tst_QWebEnginePage::setHtmlWithModuleImport()
     QWebEnginePage page;
     QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
     page.setHtml(html, server.url());
-    QVERIFY(spy.count() || spy.wait());
+    QVERIFY(spy.size() || spy.wait());
 
     QCOMPARE(evaluateJavaScriptSync(&page, "fib7"), QVariant(13));
 }
@@ -2472,7 +2472,7 @@ void tst_QWebEnginePage::baseUrl()
 
     QSignalSpy loadSpy(m_page, SIGNAL(loadFinished(bool)));
     m_page->setHtml(html, loadUrl);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(m_page->url(), url);
     QEXPECT_FAIL("null", "Slight change: We now translate QUrl() to about:blank for the virtual url, but not for the baseUrl", Continue);
     QCOMPARE(baseUrlSync(m_page), baseUrl);
@@ -2491,7 +2491,7 @@ void tst_QWebEnginePage::scrollPosition()
 
     QSignalSpy loadSpy(view.page(), SIGNAL(loadFinished(bool)));
     view.setHtml(html);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     // try to set the scroll offset programmatically
     view.page()->runJavaScript("window.scrollTo(23, 29);");
@@ -2517,7 +2517,7 @@ void tst_QWebEnginePage::scrollbarsOff()
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     view.setHtml(html);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(evaluateJavaScriptSync(view.page(), "innerWidth == document.documentElement.offsetWidth").toBool());
 }
 
@@ -2552,7 +2552,7 @@ void tst_QWebEnginePage::evaluateWillCauseRepaint()
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     view.setHtml(html);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     evaluateJavaScriptSync(view.page(), "document.getElementById('junk').style.display = 'none';");
     QSignalSpy repaintSpy(&view, &WebView::repaintRequested);
@@ -2646,7 +2646,7 @@ void tst_QWebEnginePage::setUrlToEmpty()
     expectedLoadFinishedCount++;
     QVERIFY(spy.wait());
 
-    QCOMPARE(spy.count(), expectedLoadFinishedCount);
+    QCOMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(page.url(), url);
     QCOMPARE(page.requestedUrl(), url);
     QCOMPARE(baseUrlSync(&page), url);
@@ -2655,7 +2655,7 @@ void tst_QWebEnginePage::setUrlToEmpty()
     page.setUrl(QUrl());
     expectedLoadFinishedCount++;
 
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(page.url(), aboutBlank);
     QCOMPARE(page.requestedUrl(), QUrl());
     QCOMPARE(baseUrlSync(&page), aboutBlank);
@@ -2664,7 +2664,7 @@ void tst_QWebEnginePage::setUrlToEmpty()
     page.setUrl(url);
     expectedLoadFinishedCount++;
 
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(page.url(), url);
     QCOMPARE(page.requestedUrl(), url);
     QCOMPARE(baseUrlSync(&page), url);
@@ -2673,7 +2673,7 @@ void tst_QWebEnginePage::setUrlToEmpty()
     page.load(QUrl());
     expectedLoadFinishedCount++;
 
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(page.url(), aboutBlank);
     QCOMPARE(page.requestedUrl(), QUrl());
     QCOMPARE(baseUrlSync(&page), aboutBlank);
@@ -2728,9 +2728,9 @@ void tst_QWebEnginePage::setUrlToBadDomain()
 
     page.setUrl(url1);
 
-    QTRY_COMPARE(urlSpy.count(), 1);
-    QTRY_COMPARE_WITH_TIMEOUT(titleSpy.count(), 1, 20000);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(urlSpy.size(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(titleSpy.size(), 1, 20000);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), url1);
     QCOMPARE(titleSpy.takeFirst().value(0).toString(), url1.host());
@@ -2741,9 +2741,9 @@ void tst_QWebEnginePage::setUrlToBadDomain()
 
     page.setUrl(url2);
 
-    QTRY_COMPARE(urlSpy.count(), 1);
-    QTRY_COMPARE_WITH_TIMEOUT(titleSpy.count(), 1, 20000);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(urlSpy.size(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(titleSpy.size(), 1, 20000);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), url2);
     QCOMPARE(titleSpy.takeFirst().value(0).toString(), url2.host());
@@ -2767,9 +2767,9 @@ void tst_QWebEnginePage::setUrlToBadPort()
 
     page.setUrl(url1);
 
-    QTRY_COMPARE(urlSpy.count(), 1);
-    QTRY_COMPARE(titleSpy.count(), 2);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(urlSpy.size(), 1);
+    QTRY_COMPARE(titleSpy.size(), 2);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), url1);
     QCOMPARE(titleSpy.takeFirst().value(0).toString(), url1.authority());
@@ -2781,9 +2781,9 @@ void tst_QWebEnginePage::setUrlToBadPort()
 
     page.setUrl(url2);
 
-    QTRY_COMPARE(urlSpy.count(), 1);
-    QTRY_COMPARE(titleSpy.count(), 2);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(urlSpy.size(), 1);
+    QTRY_COMPARE(titleSpy.size(), 2);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), url2);
     QCOMPARE(titleSpy.takeFirst().value(0).toString(), url2.authority());
@@ -2814,7 +2814,7 @@ void tst_QWebEnginePage::setUrlHistory()
 
     m_page->setUrl(QUrl());
     expectedLoadFinishedCount++;
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(m_page->url(), aboutBlank);
     QCOMPARE(m_page->requestedUrl(), QUrl());
     // Chromium stores navigation entry for every successful loads. The load of the empty page is committed and stored as about:blank.
@@ -2823,7 +2823,7 @@ void tst_QWebEnginePage::setUrlHistory()
     url = QUrl("http://url.invalid/");
     m_page->setUrl(url);
     expectedLoadFinishedCount++;
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), expectedLoadFinishedCount, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), expectedLoadFinishedCount, 20000);
     // When error page is disabled in case of LoadFail the entry of the unavailable page is not stored.
     // We expect the url of the previously loaded page here.
     QCOMPARE(m_page->url(), aboutBlank);
@@ -2834,14 +2834,14 @@ void tst_QWebEnginePage::setUrlHistory()
     url = QUrl("qrc:/resources/test1.html");
     m_page->setUrl(url);
     expectedLoadFinishedCount++;
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(m_page->url(), url);
     QCOMPARE(m_page->requestedUrl(), url);
     QCOMPARE(collectHistoryUrls(m_page->history()), QStringList() << aboutBlank.toString() << QStringLiteral("qrc:/resources/test1.html"));
 
     m_page->setUrl(QUrl());
     expectedLoadFinishedCount++;
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(m_page->url(), aboutBlank);
     QCOMPARE(m_page->requestedUrl(), QUrl());
     // Chromium stores navigation entry for every successful loads. The load of the empty page is committed and stored as about:blank.
@@ -2853,7 +2853,7 @@ void tst_QWebEnginePage::setUrlHistory()
     url = QUrl("qrc:/resources/test1.html");
     m_page->setUrl(url);
     expectedLoadFinishedCount++;
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(m_page->url(), url);
     QCOMPARE(m_page->requestedUrl(), url);
     // The history count DOES change since the about:blank is in the list.
@@ -2866,7 +2866,7 @@ void tst_QWebEnginePage::setUrlHistory()
     url = QUrl("qrc:/resources/test2.html");
     m_page->setUrl(url);
     expectedLoadFinishedCount++;
-    QTRY_COMPARE(spy.count(), expectedLoadFinishedCount);
+    QTRY_COMPARE(spy.size(), expectedLoadFinishedCount);
     QCOMPARE(m_page->url(), url);
     QCOMPARE(m_page->requestedUrl(), url);
     QCOMPARE(collectHistoryUrls(m_page->history()), QStringList()
@@ -2889,22 +2889,22 @@ void tst_QWebEnginePage::setUrlUsingStateObject()
     url = QUrl("qrc:/resources/test1.html");
     m_page->setUrl(url);
     expectedUrlChangeCount++;
-    QTRY_COMPARE(urlChangedSpy.count(), expectedUrlChangeCount);
+    QTRY_COMPARE(urlChangedSpy.size(), expectedUrlChangeCount);
     QCOMPARE(m_page->url(), url);
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(m_page->url(), url);
     QCOMPARE(m_page->history()->count(), 1);
 
     evaluateJavaScriptSync(m_page, "window.history.pushState(null, 'push', 'navigate/to/here')");
     expectedUrlChangeCount++;
-    QTRY_COMPARE(urlChangedSpy.count(), expectedUrlChangeCount);
+    QTRY_COMPARE(urlChangedSpy.size(), expectedUrlChangeCount);
     QCOMPARE(m_page->url(), QUrl("qrc:/resources/navigate/to/here"));
     QCOMPARE(m_page->history()->count(), 2);
     QVERIFY(m_page->history()->canGoBack());
 
     evaluateJavaScriptSync(m_page, "window.history.replaceState(null, 'replace', 'another/location')");
     expectedUrlChangeCount++;
-    QTRY_COMPARE(urlChangedSpy.count(), expectedUrlChangeCount);
+    QTRY_COMPARE(urlChangedSpy.size(), expectedUrlChangeCount);
     QCOMPARE(m_page->url(), QUrl("qrc:/resources/navigate/to/another/location"));
     QCOMPARE(m_page->history()->count(), 2);
     QVERIFY(!m_page->history()->canGoForward());
@@ -2912,7 +2912,7 @@ void tst_QWebEnginePage::setUrlUsingStateObject()
 
     evaluateJavaScriptSync(m_page, "window.history.back()");
     expectedUrlChangeCount++;
-    QTRY_COMPARE(urlChangedSpy.count(), expectedUrlChangeCount);
+    QTRY_COMPARE(urlChangedSpy.size(), expectedUrlChangeCount);
     QCOMPARE(m_page->url(), QUrl("qrc:/resources/test1.html"));
     QVERIFY(m_page->history()->canGoForward());
     QVERIFY(!m_page->history()->canGoBack());
@@ -2941,9 +2941,9 @@ void tst_QWebEnginePage::setUrlThenLoads()
     QSignalSpy finishedSpy(m_page, SIGNAL(loadFinished(bool)));
 
     m_page->setUrl(url);
-    QTRY_COMPARE(startedSpy.count(), 1);
-    QTRY_COMPARE(urlChangedSpy.count(), 1);
-    QTRY_COMPARE(finishedSpy.count(), 1);
+    QTRY_COMPARE(startedSpy.size(), 1);
+    QTRY_COMPARE(urlChangedSpy.size(), 1);
+    QTRY_COMPARE(finishedSpy.size(), 1);
     QVERIFY(finishedSpy.at(0).first().toBool());
     QCOMPARE(m_page->url(), url);
     QCOMPARE(m_page->requestedUrl(), url);
@@ -2957,11 +2957,11 @@ void tst_QWebEnginePage::setUrlThenLoads()
     QTRY_COMPARE(m_page->requestedUrl(), urlToLoad1);
     // baseUrlSync spins an event loop and this sometimes return the next result.
     // QCOMPARE(baseUrlSync(m_page), baseUrl);
-    QTRY_COMPARE(startedSpy.count(), 2);
+    QTRY_COMPARE(startedSpy.size(), 2);
 
     // After first URL changed.
-    QTRY_COMPARE(urlChangedSpy.count(), 2);
-    QTRY_COMPARE(finishedSpy.count(), 2);
+    QTRY_COMPARE(urlChangedSpy.size(), 2);
+    QTRY_COMPARE(finishedSpy.size(), 2);
     QVERIFY(finishedSpy.at(1).first().toBool());
     QCOMPARE(m_page->url(), urlToLoad1);
     QCOMPARE(m_page->requestedUrl(), urlToLoad1);
@@ -2971,11 +2971,11 @@ void tst_QWebEnginePage::setUrlThenLoads()
     QCOMPARE(m_page->url(), urlToLoad1);
     QCOMPARE(m_page->requestedUrl(), urlToLoad2);
     QCOMPARE(baseUrlSync(m_page), extractBaseUrl(urlToLoad1));
-    QTRY_COMPARE(startedSpy.count(), 3);
+    QTRY_COMPARE(startedSpy.size(), 3);
 
     // After second URL changed.
-    QTRY_COMPARE(urlChangedSpy.count(), 3);
-    QTRY_COMPARE(finishedSpy.count(), 3);
+    QTRY_COMPARE(urlChangedSpy.size(), 3);
+    QTRY_COMPARE(finishedSpy.size(), 3);
     QVERIFY(finishedSpy.at(2).first().toBool());
     QCOMPARE(m_page->url(), urlToLoad2);
     QCOMPARE(m_page->requestedUrl(), urlToLoad2);
@@ -3063,7 +3063,7 @@ void tst_QWebEnginePage::loadInSignalHandlers()
     URLSetter setter(m_page, signal, type, urlForSetter);
     QSignalSpy spy(&setter, &URLSetter::finished);
     m_page->load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 20000);
     QCOMPARE(m_page->url(), urlForSetter);
 }
 
@@ -3074,31 +3074,31 @@ void tst_QWebEnginePage::loadFromQrc()
 
     // Standard case.
     page.load(QStringLiteral("qrc:///resources/foo.txt"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     QCOMPARE(toPlainTextSync(&page), QStringLiteral("foo\n"));
 
     // Query and fragment parts are ignored.
     page.load(QStringLiteral("qrc:///resources/bar.txt?foo=1#bar"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     QCOMPARE(toPlainTextSync(&page), QStringLiteral("bar\n"));
 
     // Literal spaces are OK.
     page.load(QStringLiteral("qrc:///resources/path with spaces.txt"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     QCOMPARE(toPlainTextSync(&page), QStringLiteral("contents with spaces\n"));
 
     // Escaped spaces are OK too.
     page.load(QStringLiteral("qrc:///resources/path%20with%20spaces.txt"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     QCOMPARE(toPlainTextSync(&page), QStringLiteral("contents with spaces\n"));
 
     // Resource not found, loading fails.
     page.load(QStringLiteral("qrc:///nope"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 10000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 10000);
     QCOMPARE(spy.takeFirst().value(0).toBool(), false);
 }
 
@@ -3115,7 +3115,7 @@ void tst_QWebEnginePage::restoreHistory()
 
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
     page.load(QUrl(QStringLiteral("qrc:/resources/test1.html")));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
 
     QCOMPARE(page.webChannel(), &channel);
     QVERIFY(page.scripts().contains(script));
@@ -3125,7 +3125,7 @@ void tst_QWebEnginePage::restoreHistory()
     out << *page.history();
     QDataStream in(&data, QIODevice::ReadOnly);
     in >> *page.history();
-    QTRY_COMPARE(spy.count(), 2);
+    QTRY_COMPARE(spy.size(), 2);
 
     QCOMPARE(page.webChannel(), &channel);
     QVERIFY(page.scripts().contains(script));
@@ -3148,19 +3148,19 @@ void tst_QWebEnginePage::toPlainTextLoadFinishedRace()
     QSignalSpy spy(page.data(), SIGNAL(loadFinished(bool)));
 
     page->load(QUrl("data:text/plain,foobarbaz"));
-    QTRY_VERIFY(spy.count() == 1);
+    QTRY_VERIFY(spy.size() == 1);
     QCOMPARE(toPlainTextSync(page.data()), QString("foobarbaz"));
 
     page->load(QUrl("http://fail.invalid/"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 2, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 2, 20000);
     QString s = toPlainTextSync(page.data());
     QVERIFY(s.contains("foobarbaz") == !enableErrorPage);
 
     page->load(QUrl("data:text/plain,lalala"));
-    QTRY_COMPARE(spy.count(), 3);
+    QTRY_COMPARE(spy.size(), 3);
     QTRY_COMPARE(toPlainTextSync(page.data()), QString("lalala"));
     page.reset();
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 }
 
 void tst_QWebEnginePage::setZoomFactor()
@@ -3174,7 +3174,7 @@ void tst_QWebEnginePage::setZoomFactor()
     const QUrl url1("qrc:/resources/test1.html"), url2(QUrl("qrc:/resources/test2.html"));
 
     page.load(url1);
-    QTRY_COMPARE(page.loadSpy.count(), 1);
+    QTRY_COMPARE(page.loadSpy.size(), 1);
     QVERIFY(page.loadSpy.at(0).first().toBool());
     QCOMPARE(page.zoomFactor(), 2.5);
 
@@ -3192,7 +3192,7 @@ void tst_QWebEnginePage::setZoomFactor()
         }) {
         auto &&page = *p.first; auto zoomFactor = p.second;
         page.load(url2);
-        QTRY_COMPARE(page.loadSpy.count(), 1);
+        QTRY_COMPARE(page.loadSpy.size(), 1);
         QVERIFY(page.loadSpy.last().first().toBool());
         QCOMPARE(page.zoomFactor(), zoomFactor);
     }
@@ -3220,7 +3220,7 @@ void tst_QWebEnginePage::mouseButtonTranslation()
     view.resize(640, 480);
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    QTRY_VERIFY(spy.count() == 1);
+    QTRY_VERIFY(spy.size() == 1);
 
     QVERIFY(view.focusProxy() != nullptr);
 
@@ -3262,14 +3262,14 @@ void tst_QWebEnginePage::mouseMovementProperties()
     loadFinishedSpy.wait();
 
     QTest::mouseMove(&view, QPoint(20, 20));
-    QTRY_COMPARE(page.messages.count(), 1);
+    QTRY_COMPARE(page.messages.size(), 1);
 
     QTest::mouseMove(&view, QPoint(30, 30));
-    QTRY_COMPARE(page.messages.count(), 2);
+    QTRY_COMPARE(page.messages.size(), 2);
     QTRY_COMPARE(page.messages[1], QString("10, 10"));
 
     QTest::mouseMove(&view, QPoint(20, 20));
-    QTRY_COMPARE(page.messages.count(), 3);
+    QTRY_COMPARE(page.messages.size(), 3);
     QTRY_COMPARE(page.messages[2], QString("-10, -10"));
 }
 
@@ -3282,7 +3282,7 @@ QPoint tst_QWebEnginePage::elementCenter(QWebEnginePage *page, const QString &id
             "return [(rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2];"
             "})()").toList();
 
-    if (rectList.count() != 2) {
+    if (rectList.size() != 2) {
         qWarning("elementCenter failed.");
         return QPoint();
     }
@@ -3298,12 +3298,12 @@ void tst_QWebEnginePage::viewSource()
     const QUrl url("qrc:/resources/test1.html");
 
     page.load(url);
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(page.title(), QStringLiteral("Test page 1"));
     QVERIFY(page.action(QWebEnginePage::ViewSource)->isEnabled());
 
     page.triggerAction(QWebEnginePage::ViewSource);
-    QTRY_COMPARE(windowCreatedSpy.count(), 1);
+    QTRY_COMPARE(windowCreatedSpy.size(), 1);
     QCOMPARE(page.createdWindows.size(), 1);
 
     QTRY_COMPARE(page.createdWindows[0]->url().toString(), QStringLiteral("view-source:%1").arg(url.toString()));
@@ -3358,7 +3358,7 @@ void tst_QWebEnginePage::viewSourceURL()
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
 
     page.load(userInputUrl);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 12000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 12000);
     QList<QVariant> arguments = loadFinishedSpy.takeFirst();
 
     QCOMPARE(arguments.at(0).toBool(), loadSucceed);
@@ -3393,7 +3393,7 @@ void tst_QWebEnginePage::viewSourceCredentials()
     QVERIFY(page.action(QWebEnginePage::ViewSource)->isEnabled());
 
     page.triggerAction(QWebEnginePage::ViewSource);
-    QTRY_COMPARE(windowCreatedSpy.count(), 1);
+    QTRY_COMPARE(windowCreatedSpy.size(), 1);
     QCOMPARE(page.createdWindows.size(), 1);
 
     QTRY_COMPARE(page.createdWindows[0]->url().toString(), QString("view-source:" + url.toDisplayString(QUrl::RemoveUserInfo)));
@@ -3415,7 +3415,7 @@ void tst_QWebEnginePage::proxyConfigWithUnexpectedHostPortPair()
 
     QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
     m_page->load(QStringLiteral("http://127.0.0.1:245/"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 }
 
 void tst_QWebEnginePage::registerProtocolHandler_data()
@@ -3448,7 +3448,7 @@ void tst_QWebEnginePage::registerProtocolHandler()
     QSignalSpy permissionSpy(&page, &QWebEnginePage::registerProtocolHandlerRequested);
 
     page.setUrl(server.url("/"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), true);
 
     QString callFormat = QStringLiteral("window.navigator.registerProtocolHandler(\"%1\", \"%2\", \"%3\")");
@@ -3458,7 +3458,7 @@ void tst_QWebEnginePage::registerProtocolHandler()
     QString call = callFormat.arg(scheme).arg(url).arg(title);
     page.runJavaScript(call);
 
-    QTRY_COMPARE(permissionSpy.count(), 1);
+    QTRY_COMPARE(permissionSpy.size(), 1);
     auto request = permissionSpy.takeFirst().value(0).value<QWebEngineRegisterProtocolHandlerRequest>();
     QCOMPARE(request.origin(), QUrl(url));
     QCOMPARE(request.scheme(), scheme);
@@ -3469,7 +3469,7 @@ void tst_QWebEnginePage::registerProtocolHandler()
 
     page.runJavaScript(QStringLiteral("document.getElementById(\"link\").click()"));
 
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0).toBool(), permission);
     QCOMPARE(mailRequestCount, permission ? 1 : 0);
     QVERIFY(server.stop());
@@ -3485,7 +3485,7 @@ void tst_QWebEnginePage::dataURLFragment()
     m_page->setHtml("<html><body>"
                     "<a id='link' href='#anchor'>anchor</a>"
                     "</body></html>", QUrl("http://test.qt.io/mytest.html"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     QTest::mouseClick(m_view->focusProxy(), Qt::LeftButton, {}, elementCenter(m_page, "link"));
     QVERIFY(urlChangedSpy.wait());
@@ -3509,7 +3509,7 @@ void tst_QWebEnginePage::devTools()
     QCOMPARE(devToolsPage.devToolsPage(), nullptr);
     QCOMPARE(devToolsPage.inspectedPage(), &inspectedPage1);
 
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 90000);
     QVERIFY(spy.takeFirst().value(0).toBool());
 
     devToolsPage.setInspectedPage(&inspectedPage2);
@@ -3521,7 +3521,7 @@ void tst_QWebEnginePage::devTools()
     QCOMPARE(devToolsPage.devToolsPage(), nullptr);
     QCOMPARE(devToolsPage.inspectedPage(), &inspectedPage2);
 
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 90000);
     QVERIFY(spy.takeFirst().value(0).toBool());
 
     devToolsPage.setInspectedPage(nullptr);
@@ -3553,11 +3553,11 @@ void tst_QWebEnginePage::openLinkInDifferentProfile()
     page1.setHtml("<html><body>"
                   "<a id='link' href='hello'>link</a>"
                   "</body></html>", QUrl("echo:/"));
-    QTRY_COMPARE(spy1.count(), 1);
+    QTRY_COMPARE(spy1.size(), 1);
     QVERIFY(spy1.takeFirst().value(0).toBool());
     targetPage = &page2;
     QTest::mouseClick(view.focusProxy(), Qt::MiddleButton, {}, elementCenter(&page1, "link"));
-    QTRY_COMPARE(spy2.count(), 1);
+    QTRY_COMPARE(spy2.size(), 1);
     QVERIFY(spy2.takeFirst().value(0).toBool());
 }
 
@@ -3667,7 +3667,7 @@ void tst_QWebEnginePage::openLinkInNewPage()
     page1.setHtml("<html><body>"
                   "<a id='link' href='hello' target='_blank'>link</a>"
                   "</body></html>", QUrl("echo:/"));
-    QTRY_COMPARE(page1.spy.count(), 1);
+    QTRY_COMPARE(page1.spy.size(), 1);
     QVERIFY(page1.spy.takeFirst().value(0).toBool());
 
     switch (decision) {
@@ -3697,13 +3697,13 @@ void tst_QWebEnginePage::openLinkInNewPage()
     case Effect::Blocked:
         // Test nothing new loaded
         QTest::qWait(500);
-        QCOMPARE(page1.spy.count(), 0);
-        QCOMPARE(page2.spy.count(), 0);
+        QCOMPARE(page1.spy.size(), 0);
+        QCOMPARE(page2.spy.size(), 0);
         break;
     case Effect::LoadInSelf:
-        QTRY_COMPARE(page1.spy.count(), 1);
+        QTRY_COMPARE(page1.spy.size(), 1);
         QVERIFY(page1.spy.takeFirst().value(0).toBool());
-        QCOMPARE(page2.spy.count(), 0);
+        QCOMPARE(page2.spy.size(), 0);
         if (decision == Decision::ReturnSelf && cause == Cause::TargetBlank)
             // History was discarded due to AddNewContents
             QCOMPARE(page1.history()->count(), 1);
@@ -3712,9 +3712,9 @@ void tst_QWebEnginePage::openLinkInNewPage()
         QCOMPARE(page2.history()->count(), 0);
         break;
     case Effect::LoadInOther:
-        QTRY_COMPARE(page2.spy.count(), 1);
+        QTRY_COMPARE(page2.spy.size(), 1);
         QVERIFY(page2.spy.takeFirst().value(0).toBool());
-        QCOMPARE(page1.spy.count(), 0);
+        QCOMPARE(page1.spy.size(), 0);
         QCOMPARE(page1.history()->count(), 1);
         QCOMPARE(page2.history()->count(), 1);
         break;
@@ -3736,7 +3736,7 @@ void tst_QWebEnginePage::dynamicFrame()
     page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
     page.load(QStringLiteral("qrc:/resources/dynamicFrame.html"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(toPlainTextSync(&page).trimmed(), QStringLiteral("foo"));
 }
 
@@ -3812,7 +3812,7 @@ void tst_QWebEnginePage::notificationPermission()
 
     QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
     page.setHtml(QString("<html><body>Test</body></html>"), baseUrl);
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
 
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("Notification.permission")), setOnInit ? permission : QLatin1String("default"));
 
@@ -3880,8 +3880,8 @@ void tst_QWebEnginePage::contentsSize()
 
     m_view->setHtml(QString("<html><body style=\"width: 1600px; height: 1200px;\"><p>hi</p></body></html>"));
 
-    QTRY_COMPARE(loadSpy.count(), 1);
-    QTRY_COMPARE(contentsSizeChangedSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
+    QTRY_COMPARE(contentsSizeChangedSpy.size(), 1);
 
     // Verify the page's contents size is not limited by the view's size.
     QCOMPARE(m_page->contentsSize().width(), 1608);
@@ -3909,64 +3909,64 @@ void tst_QWebEnginePage::setLifecycleState()
     QSignalSpy visibleSpy(&page, &QWebEnginePage::visibleChanged);
 
     page.load(QStringLiteral("qrc:/resources/lifecycle.html"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant(false));
     QCOMPARE(evaluateJavaScriptSync(&page, "frozenness"), QVariant(0));
 
     // Active -> Frozen
     page.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Frozen);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant(false));
     QCOMPARE(evaluateJavaScriptSync(&page, "frozenness"), QVariant(1));
 
     // Frozen -> Active
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant(false));
     QCOMPARE(evaluateJavaScriptSync(&page, "frozenness"), QVariant(0));
 
     // Active -> Discarded
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Discarded);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
     QTest::ignoreMessage(QtWarningMsg, "runJavaScript: disabled in Discarded state");
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant());
     QTest::ignoreMessage(QtWarningMsg, "runJavaScript: disabled in Discarded state");
     QCOMPARE(evaluateJavaScriptSync(&page, "frozenness"), QVariant());
-    QCOMPARE(loadSpy.count(), 0);
+    QCOMPARE(loadSpy.size(), 0);
 
     // Discarded -> Frozen (illegal!)
     QTest::ignoreMessage(QtWarningMsg,
                          "setLifecycleState: failed to transition from Discarded to Frozen state: "
                          "illegal transition");
     page.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Discarded);
 
     // Discarded -> Active
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant(true));
     QCOMPARE(evaluateJavaScriptSync(&page, "frozenness"), QVariant(0));
@@ -3975,21 +3975,21 @@ void tst_QWebEnginePage::setLifecycleState()
     page.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(lifecycleSpy.count(), 3);
+    QCOMPARE(lifecycleSpy.size(), 3);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant(true));
     QCOMPARE(evaluateJavaScriptSync(&page, "frozenness"), QVariant(0));
 
     // Reload clears document.wasDiscarded
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
     QCOMPARE(evaluateJavaScriptSync(&page, "document.wasDiscarded"), QVariant(false));
 }
@@ -4005,18 +4005,18 @@ void tst_QWebEnginePage::setVisible()
     QSignalSpy visibleSpy(&page, &QWebEnginePage::visibleChanged);
 
     page.load(QStringLiteral("about:blank"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 0);
+    QCOMPARE(visibleSpy.size(), 0);
     QCOMPARE(page.isVisible(), false);
 
     // hidden -> visible
     page.setVisible(true);
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 1);
+    QCOMPARE(visibleSpy.size(), 1);
     QCOMPARE(visibleSpy.takeFirst().value(0), QVariant(true));
     QCOMPARE(page.isVisible(), true);
 
@@ -4025,28 +4025,28 @@ void tst_QWebEnginePage::setVisible()
             QtWarningMsg,
             "setLifecycleState: failed to transition from Active to Frozen state: page is visible");
     page.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
 
     // visible -> hidden
     page.setVisible(false);
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 1);
+    QCOMPARE(visibleSpy.size(), 1);
     QCOMPARE(visibleSpy.takeFirst().value(0), QVariant(false));
     QCOMPARE(page.isVisible(), false);
 
     // Active -> Frozen
     page.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Frozen);
 
     // hidden -> visible (triggers Frozen -> Active)
     page.setVisible(true);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 1);
+    QCOMPARE(visibleSpy.size(), 1);
     QCOMPARE(visibleSpy.takeFirst().value(0), QVariant(true));
     QCOMPARE(page.isVisible(), true);
 
@@ -4055,31 +4055,31 @@ void tst_QWebEnginePage::setVisible()
                          "setLifecycleState: failed to transition from Active to Discarded state: "
                          "page is visible");
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
 
     // visible -> hidden
     page.setVisible(false);
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 1);
+    QCOMPARE(visibleSpy.size(), 1);
     QCOMPARE(visibleSpy.takeFirst().value(0), QVariant(false));
     QCOMPARE(page.isVisible(), false);
 
     // Active -> Discarded
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Discarded);
 
     // hidden -> visible (triggers Discarded -> Active)
     page.setVisible(true);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(visibleSpy.count(), 1);
+    QCOMPARE(visibleSpy.size(), 1);
     QCOMPARE(visibleSpy.takeFirst().value(0), QVariant(true));
     QCOMPARE(page.isVisible(), true);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
 }
 
@@ -4090,7 +4090,7 @@ void tst_QWebEnginePage::discardPreservesProperties()
     QSignalSpy loadSpy(&page, &QWebEnginePage::loadFinished);
 
     page.load(QStringLiteral("about:blank"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
 
     // Change as many properties as possible to non-default values
@@ -4127,7 +4127,7 @@ void tst_QWebEnginePage::discardPreservesProperties()
     // Discard + undiscard
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
 
     // Property changes should be preserved
@@ -4166,7 +4166,7 @@ void tst_QWebEnginePage::automaticUndiscard()
     QSignalSpy loadSpy(&page, &QWebEnginePage::loadFinished);
 
     page.load(QStringLiteral("about:blank"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
 
     // setUrl
@@ -4191,16 +4191,16 @@ void tst_QWebEnginePage::setLifecycleStateWithDevTools()
     // Ensure pages are initialized
     inspectedPage.load(QStringLiteral("about:blank"));
     devToolsPage.load(QStringLiteral("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(inspectedSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(inspectedSpy.size(), 1, 90000);
     QCOMPARE(inspectedSpy.takeFirst().value(0), QVariant(true));
-    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.size(), 1, 90000);
     QCOMPARE(devToolsSpy.takeFirst().value(0), QVariant(true));
 
     // Open DevTools with Frozen inspectedPage
     inspectedPage.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
     inspectedPage.setDevToolsPage(&devToolsPage);
     QCOMPARE(inspectedPage.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.size(), 1, 90000);
     QCOMPARE(devToolsSpy.takeFirst().value(0), QVariant(true));
     inspectedPage.setDevToolsPage(nullptr);
 
@@ -4208,9 +4208,9 @@ void tst_QWebEnginePage::setLifecycleStateWithDevTools()
     inspectedPage.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     inspectedPage.setDevToolsPage(&devToolsPage);
     QCOMPARE(inspectedPage.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.size(), 1, 90000);
     QCOMPARE(devToolsSpy.takeFirst().value(0), QVariant(true));
-    QTRY_COMPARE(inspectedSpy.count(), 1);
+    QTRY_COMPARE(inspectedSpy.size(), 1);
     QCOMPARE(inspectedSpy.takeFirst().value(0), QVariant(true));
     inspectedPage.setDevToolsPage(nullptr);
 
@@ -4218,7 +4218,7 @@ void tst_QWebEnginePage::setLifecycleStateWithDevTools()
     devToolsPage.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
     devToolsPage.setInspectedPage(&inspectedPage);
     QCOMPARE(devToolsPage.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.size(), 1, 90000);
     QCOMPARE(devToolsSpy.takeFirst().value(0), QVariant(true));
     devToolsPage.setInspectedPage(nullptr);
 
@@ -4226,7 +4226,7 @@ void tst_QWebEnginePage::setLifecycleStateWithDevTools()
     devToolsPage.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     devToolsPage.setInspectedPage(&inspectedPage);
     QCOMPARE(devToolsPage.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(devToolsSpy.size(), 1, 90000);
     QCOMPARE(devToolsSpy.takeFirst().value(0), QVariant(true));
     // keep DevTools open
 
@@ -4264,35 +4264,35 @@ void tst_QWebEnginePage::discardPreservesCommittedLoad()
 
     QString url = QStringLiteral("qrc:/resources/lifecycle.html");
     page.setUrl(url);
-    QTRY_COMPARE(loadStartedSpy.count(), 1);
+    QTRY_COMPARE(loadStartedSpy.size(), 1);
     loadStartedSpy.clear();
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(loadFinishedSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(urlChangedSpy.count(), 1);
+    QCOMPARE(urlChangedSpy.size(), 1);
     QCOMPARE(urlChangedSpy.takeFirst().value(0), QVariant(QUrl(url)));
     QCOMPARE(page.url(), url);
-    QCOMPARE(titleChangedSpy.count(), 2);
+    QCOMPARE(titleChangedSpy.size(), 2);
     QCOMPARE(titleChangedSpy.takeFirst().value(0), QVariant(url));
     QString title = QStringLiteral("Lifecycle");
     QCOMPARE(titleChangedSpy.takeFirst().value(0), QVariant(title));
     QCOMPARE(page.title(), title);
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
-    QCOMPARE(loadStartedSpy.count(), 0);
-    QCOMPARE(loadFinishedSpy.count(), 0);
-    QCOMPARE(urlChangedSpy.count(), 0);
+    QCOMPARE(loadStartedSpy.size(), 0);
+    QCOMPARE(loadFinishedSpy.size(), 0);
+    QCOMPARE(urlChangedSpy.size(), 0);
     QCOMPARE(page.url(), QUrl(url));
-    QCOMPARE(titleChangedSpy.count(), 0);
+    QCOMPARE(titleChangedSpy.size(), 0);
     QCOMPARE(page.title(), title);
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE(loadStartedSpy.count(), 1);
+    QTRY_COMPARE(loadStartedSpy.size(), 1);
     loadStartedSpy.clear();
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(loadFinishedSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(urlChangedSpy.count(), 0);
+    QCOMPARE(urlChangedSpy.size(), 0);
     QCOMPARE(page.url(), url);
-    QCOMPARE(titleChangedSpy.count(), 0);
+    QCOMPARE(titleChangedSpy.size(), 0);
     QCOMPARE(page.title(), title);
 }
 
@@ -4309,21 +4309,21 @@ void tst_QWebEnginePage::discardAbortsPendingLoad()
             [&]() { page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded); });
     QUrl url = QStringLiteral("qrc:/resources/lifecycle.html");
     page.setUrl(url);
-    QTRY_COMPARE(loadStartedSpy.count(), 1);
+    QTRY_COMPARE(loadStartedSpy.size(), 1);
     loadStartedSpy.clear();
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(loadFinishedSpy.takeFirst().value(0), QVariant(false));
-    QCOMPARE(urlChangedSpy.count(), 2);
+    QCOMPARE(urlChangedSpy.size(), 2);
     QCOMPARE(urlChangedSpy.takeFirst().value(0), QVariant(url));
     QCOMPARE(urlChangedSpy.takeFirst().value(0), QVariant(QUrl()));
-    QCOMPARE(titleChangedSpy.count(), 0);
+    QCOMPARE(titleChangedSpy.size(), 0);
     QCOMPARE(page.url(), QUrl());
     QCOMPARE(page.title(), QString());
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(loadStartedSpy.count(), 0);
-    QCOMPARE(loadFinishedSpy.count(), 0);
-    QCOMPARE(urlChangedSpy.count(), 0);
+    QCOMPARE(loadStartedSpy.size(), 0);
+    QCOMPARE(loadFinishedSpy.size(), 0);
+    QCOMPARE(urlChangedSpy.size(), 0);
     QCOMPARE(page.url(), QUrl());
     QCOMPARE(page.title(), QString());
 }
@@ -4339,14 +4339,14 @@ void tst_QWebEnginePage::discardAbortsPendingLoadAndPreservesCommittedLoad()
 
     QString url1 = QStringLiteral("qrc:/resources/lifecycle.html");
     page.setUrl(url1);
-    QTRY_COMPARE(loadStartedSpy.count(), 1);
+    QTRY_COMPARE(loadStartedSpy.size(), 1);
     loadStartedSpy.clear();
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(loadFinishedSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(urlChangedSpy.count(), 1);
+    QCOMPARE(urlChangedSpy.size(), 1);
     QCOMPARE(urlChangedSpy.takeFirst().value(0), QVariant(QUrl(url1)));
     QCOMPARE(page.url(), url1);
-    QCOMPARE(titleChangedSpy.count(), 2);
+    QCOMPARE(titleChangedSpy.size(), 2);
     QCOMPARE(titleChangedSpy.takeFirst().value(0), QVariant(url1));
     QString title = QStringLiteral("Lifecycle");
     QCOMPARE(titleChangedSpy.takeFirst().value(0), QVariant(title));
@@ -4356,21 +4356,21 @@ void tst_QWebEnginePage::discardAbortsPendingLoadAndPreservesCommittedLoad()
             [&]() { page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded); });
     QString url2 = QStringLiteral("about:blank");
     page.setUrl(url2);
-    QTRY_COMPARE(loadStartedSpy.count(), 1);
+    QTRY_COMPARE(loadStartedSpy.size(), 1);
     loadStartedSpy.clear();
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(loadFinishedSpy.takeFirst().value(0), QVariant(false));
-    QCOMPARE(urlChangedSpy.count(), 2);
+    QCOMPARE(urlChangedSpy.size(), 2);
     QCOMPARE(urlChangedSpy.takeFirst().value(0), QVariant(QUrl(url2)));
     QCOMPARE(urlChangedSpy.takeFirst().value(0), QVariant(QUrl(url1)));
-    QCOMPARE(titleChangedSpy.count(), 0);
+    QCOMPARE(titleChangedSpy.size(), 0);
     QCOMPARE(page.url(), url1);
     QCOMPARE(page.title(), title);
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(loadStartedSpy.count(), 0);
-    QCOMPARE(loadFinishedSpy.count(), 0);
-    QCOMPARE(urlChangedSpy.count(), 0);
+    QCOMPARE(loadStartedSpy.size(), 0);
+    QCOMPARE(loadFinishedSpy.size(), 0);
+    QCOMPARE(urlChangedSpy.size(), 0);
     QCOMPARE(page.url(), url1);
     QCOMPARE(page.title(), title);
 }
@@ -4466,32 +4466,32 @@ void tst_QWebEnginePage::recommendedStateAuto()
     connect(&page, &QWebEnginePage::recommendedStateChanged, &page, &QWebEnginePage::setLifecycleState);
 
     page.load(QStringLiteral("qrc:/resources/lifecycle.html"));
-    QTRY_COMPARE(lifecycleSpy.count(), 2);
+    QTRY_COMPARE(lifecycleSpy.size(), 2);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
 
     page.setVisible(true);
-    QTRY_COMPARE(lifecycleSpy.count(), 1);
+    QTRY_COMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
 
     page.setVisible(false);
-    QTRY_COMPARE(lifecycleSpy.count(), 2);
+    QTRY_COMPARE(lifecycleSpy.size(), 2);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
 
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(lifecycleSpy.count(), 3);
+    QTRY_COMPARE(lifecycleSpy.size(), 3);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
 
     QWebEnginePage devTools;
     page.setDevToolsPage(&devTools);
-    QTRY_COMPARE(lifecycleSpy.count(), 1);
+    QTRY_COMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
 
     page.setDevToolsPage(nullptr);
-    QTRY_COMPARE(lifecycleSpy.count(), 2);
+    QTRY_COMPARE(lifecycleSpy.size(), 2);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
 }
@@ -4506,33 +4506,33 @@ void tst_QWebEnginePage::setLifecycleStateAndReload()
     QSignalSpy lifecycleSpy(&page, &QWebEnginePage::lifecycleStateChanged);
 
     page.load(QStringLiteral("qrc:/resources/lifecycle.html"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
-    QCOMPARE(lifecycleSpy.count(), 0);
+    QCOMPARE(lifecycleSpy.size(), 0);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Frozen);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Frozen);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Frozen));
 
     page.triggerAction(QWebEnginePage::Reload);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Discarded);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Discarded));
 
     page.triggerAction(QWebEnginePage::Reload);
     QCOMPARE(page.lifecycleState(), QWebEnginePage::LifecycleState::Active);
-    QCOMPARE(lifecycleSpy.count(), 1);
+    QCOMPARE(lifecycleSpy.size(), 1);
     QCOMPARE(lifecycleSpy.takeFirst().value(0), QVariant::fromValue(QWebEnginePage::LifecycleState::Active));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QCOMPARE(loadSpy.takeFirst().value(0), QVariant(true));
 }
 
@@ -4551,20 +4551,20 @@ void tst_QWebEnginePage::editActionsWithExplicitFocus()
     QVERIFY(!page->action(QWebEnginePage::SelectAll)->isEnabled());
 
     page->setHtml(QString("<html><body><div>foo bar</div></body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     // Still no focus because focus on navigation is disabled. Edit actions don't do anything (should not crash).
     QVERIFY(!page->action(QWebEnginePage::SelectAll)->isEnabled());
     view.page()->triggerAction(QWebEnginePage::SelectAll);
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
     QCOMPARE(page->hasSelection(), false);
 
     // Focus content by focusing window from JavaScript. Edit actions should be enabled and functional.
     evaluateJavaScriptSync(page, "window.focus();");
-    QTRY_COMPARE(actionChangedSpy.count(), 1);
+    QTRY_COMPARE(actionChangedSpy.size(), 1);
     QVERIFY(page->action(QWebEnginePage::SelectAll)->isEnabled());
     view.page()->triggerAction(QWebEnginePage::SelectAll);
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
     QCOMPARE(page->hasSelection(), true);
     QCOMPARE(page->selectedText(), QStringLiteral("foo bar"));
 }
@@ -4584,13 +4584,13 @@ void tst_QWebEnginePage::editActionsWithInitialFocus()
     QVERIFY(!page->action(QWebEnginePage::SelectAll)->isEnabled());
 
     page->setHtml(QString("<html><body><div>foo bar</div></body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     // Content gets initial focus.
-    QTRY_COMPARE(actionChangedSpy.count(), 1);
+    QTRY_COMPARE(actionChangedSpy.size(), 1);
     QVERIFY(page->action(QWebEnginePage::SelectAll)->isEnabled());
     view.page()->triggerAction(QWebEnginePage::SelectAll);
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
     QCOMPARE(page->hasSelection(), true);
     QCOMPARE(page->selectedText(), QStringLiteral("foo bar"));
 }
@@ -4610,15 +4610,15 @@ void tst_QWebEnginePage::editActionsWithFocusOnIframe()
     QVERIFY(!page->action(QWebEnginePage::SelectAll)->isEnabled());
 
     page->load(QUrl("qrc:///resources/iframe2.html"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QVERIFY(!page->action(QWebEnginePage::SelectAll)->isEnabled());
 
     // Focusing an iframe.
     evaluateJavaScriptSync(page, "document.getElementsByTagName('iframe')[0].contentWindow.focus()");
-    QTRY_COMPARE(actionChangedSpy.count(), 1);
+    QTRY_COMPARE(actionChangedSpy.size(), 1);
     QVERIFY(page->action(QWebEnginePage::SelectAll)->isEnabled());
     view.page()->triggerAction(QWebEnginePage::SelectAll);
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
     QCOMPARE(page->hasSelection(), true);
     QCOMPARE(page->selectedText(), QStringLiteral("inner"));
 }
@@ -4634,8 +4634,8 @@ void tst_QWebEnginePage::editActionsWithoutSelection()
     QSignalSpy actionChangedSpy(page->action(QWebEnginePage::SelectAll), &QAction::changed);
 
     page->setHtml(QString("<html><body><div>foo bar</div></body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
-    QTRY_COMPARE(actionChangedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
+    QTRY_COMPARE(actionChangedSpy.size(), 1);
 
     QVERIFY(!page->action(QWebEnginePage::Cut)->isEnabled());
     QVERIFY(!page->action(QWebEnginePage::Copy)->isEnabled());
@@ -4647,7 +4647,7 @@ void tst_QWebEnginePage::editActionsWithoutSelection()
     QVERIFY(!page->action(QWebEnginePage::Unselect)->isEnabled());
 
     page->triggerAction(QWebEnginePage::SelectAll);
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
     QCOMPARE(page->hasSelection(), true);
     QCOMPARE(page->selectedText(), QStringLiteral("foo bar"));
 
@@ -4707,12 +4707,12 @@ void tst_QWebEnginePage::customUserAgentInNewTab()
     page.setHtml(QString("<html><body><a id='link' target='_blank' href='") +
                  server.url("/test1").toEncoded() +
                  QString("'>link</a></body></html>"));
-    QTRY_COMPARE(page.loadSpy.count(), 1);
+    QTRY_COMPARE(page.loadSpy.size(), 1);
     QVERIFY(page.loadSpy.takeFirst().value(0).toBool());
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), expectedUserAgent);
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, elementCenter(&page, "link"));
     QTRY_VERIFY(page.newPage);
-    QTRY_COMPARE(page.newPage->loadSpy.count(), 1);
+    QTRY_COMPARE(page.newPage->loadSpy.size(), 1);
     QTRY_VERIFY(!lastUserAgent.isEmpty());
     QCOMPARE(lastUserAgent, expectedUserAgent);
     QCOMPARE(evaluateJavaScriptSync(page.newPage.get(), QStringLiteral("navigator.userAgent")).toString(), expectedUserAgent);
@@ -4726,11 +4726,11 @@ void tst_QWebEnginePage::customUserAgentInNewTab()
     page.setHtml(QString("<html><body><a id='link' target='_blank' href='") +
                  server.url("/test2").toEncoded() +
                  QString("'>link</a></body></html>"));
-    QTRY_COMPARE(page.loadSpy.count(), 1);
+    QTRY_COMPARE(page.loadSpy.size(), 1);
     QVERIFY(page.loadSpy.takeFirst().value(0).toBool());
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, elementCenter(&page, "link"));
     QTRY_VERIFY(page.newPage);
-    QTRY_COMPARE(page.newPage->loadSpy.count(), 1);
+    QTRY_COMPARE(page.newPage->loadSpy.size(), 1);
     QTRY_VERIFY(!lastUserAgent.isEmpty());
     QCOMPARE(lastUserAgent, expectedUserAgent);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), expectedUserAgent);
@@ -4763,7 +4763,7 @@ void tst_QWebEnginePage::openNewTabInDifferentProfile()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     page.setHtml(QString("<html><body><a id='link' target='_blank' href='%1'>link</a></body></html>").arg(server.url("/first.html").toEncoded()));
-    QTRY_COMPARE(page.loadSpy.count(), 1);
+    QTRY_COMPARE(page.loadSpy.size(), 1);
     QVERIFY(page.loadSpy.takeFirst().value(0).toBool());
 
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, elementCenter(&page, "link"));
@@ -4890,7 +4890,7 @@ void tst_QWebEnginePage::testChooseFilesParameters()
                              "</body></html>"), QString("qrc:/"));
     }
     QVERIFY(spyFinished.wait());
-    QTRY_COMPARE(spyFinished.count(), 1);
+    QTRY_COMPARE(spyFinished.size(), 1);
 
     evaluateJavaScriptSync(view.page(), "document.getElementById('filePicker').focus()");
     QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("filePicker"));
@@ -4935,7 +4935,7 @@ void tst_QWebEnginePage::fileSystemAccessDialog()
                          "</body></html>"),
                  QString("qrc:/"));
     QVERIFY(spyFinished.wait());
-    QTRY_COMPARE(spyFinished.count(), 1);
+    QTRY_COMPARE(spyFinished.size(), 1);
 
     evaluateJavaScriptSync(view.page(), "document.getElementById('triggerDialog').focus()");
     QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(),
@@ -5001,11 +5001,11 @@ void tst_QWebEnginePage::audioMuted()
     page.setAudioMuted(true);
     loadSync(&page, QUrl("about:blank"));
     QCOMPARE(page.isAudioMuted(), true);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy[0][0], QVariant(true));
     page.setAudioMuted(false);
     QCOMPARE(page.isAudioMuted(), false);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QCOMPARE(spy[1][0], QVariant(false));
 }
 
@@ -5015,9 +5015,9 @@ void tst_QWebEnginePage::closeContents()
     QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
     QSignalSpy windowCreatedSpy(&page, &TestPage::windowCreated);
     page.setUrl(QUrl("about:blank"));
-    QTRY_COMPARE(spyFinished.count(), 1);
+    QTRY_COMPARE(spyFinished.size(), 1);
     page.runJavaScript("var dialog = window.open('', '', 'width=100, height=100');");
-    QTRY_COMPARE(windowCreatedSpy.count(), 1);
+    QTRY_COMPARE(windowCreatedSpy.size(), 1);
 
     QWebEngineView *dialogView = new QWebEngineView;
     QWebEnginePage *dialogPage = page.createdWindows[0];
@@ -5058,7 +5058,7 @@ void tst_QWebEnginePage::isSafeRedirect()
     TestPage page;
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
     page.setUrl(requestedUrl);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 20000);
     QCOMPARE(page.url(), expectedUrl);
     spy.clear();
 }
@@ -5098,18 +5098,18 @@ void tst_QWebEnginePage::localToRemoteNavigation()
     view.setPage(&page);
     page.setUrl(QUrl("local://test.html"));
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 20000);
     QVERIFY(local.loaded);
 
     // Should navigate:
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, elementCenter(&page, "link"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 2, 20000);
     QVERIFY(remote.loaded);
     local.loaded = false;
     remote.loaded = false;
 
     page.setUrl(QUrl("local://test.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 3, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 3, 20000);
     QVERIFY(local.loaded && !remote.loaded);
 
     // Should not navigate:
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 35c66e9ed..471385223 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -407,8 +407,8 @@ void tst_QWebEngineProfile::urlSchemeHandlers()
     QCOMPARE(toPlainTextSync(view.page()), url.toString());
 
     // Check that all buffers got deleted
-    QCOMPARE(gopherHandler.m_buffers.count(), 2);
-    for (int i = 0; i < gopherHandler.m_buffers.count(); ++i)
+    QCOMPARE(gopherHandler.m_buffers.size(), 2);
+    for (int i = 0; i < gopherHandler.m_buffers.size(); ++i)
         QVERIFY(gopherHandler.m_buffers.at(i).isNull());
 }
 
@@ -469,7 +469,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerFailRequest()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("foo://bar")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QCOMPARE(toPlainTextSync(view.page()), QString());
 }
 
@@ -484,7 +484,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerFailOnRead()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("foo://bar")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QCOMPARE(toPlainTextSync(view.page()), QString());
 }
 
@@ -499,7 +499,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerStreaming()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("stream://whatever")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QByteArray result;
     result.append(1000, 'c');
     QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
@@ -516,7 +516,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerStreaming2()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("stream://whatever")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QByteArray result;
     result.append(1000, 'c');
     QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
@@ -577,7 +577,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerRequestHeaders()
     QWebEnginePage page(&profile);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.load(QUrl(QStringLiteral("myscheme://whatever")));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
 }
 
 void tst_QWebEngineProfile::urlSchemeHandlerInstallation()
@@ -743,12 +743,12 @@ void tst_QWebEngineProfile::urlSchemeHandlerScriptModule()
     QWebEnginePage page(&profile);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><head><script src=\"aviancarrier:///\"></script></head><body>Test1</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("test")).toString(), QStringLiteral("SUCCESS"));
 
     loadFinishedSpy.clear();
     page.setHtml(QStringLiteral("<html><head><script type=\"module\" src=\"aviancarrier:///\"></script></head><body>Test2</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("test")).toString(), QStringLiteral("SUCCESS"));
 }
 
@@ -783,7 +783,7 @@ void tst_QWebEngineProfile::customUserAgent()
     QWebEnginePage page;
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><body>Hello world!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     // First test the user-agent is default
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), defaultUserAgent);
@@ -796,7 +796,7 @@ void tst_QWebEngineProfile::customUserAgent()
     QWebEnginePage page2(&testProfile);
     QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
     page2.setHtml(QStringLiteral("<html><body>Hello again!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy2.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page2, QStringLiteral("navigator.userAgent")).toString(), testUserAgent);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), defaultUserAgent);
 
@@ -810,7 +810,7 @@ void tst_QWebEngineProfile::httpAcceptLanguage()
     QWebEnginePage page;
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><body>Hello world!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     QStringList defaultLanguages = evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList();
 
@@ -822,7 +822,7 @@ void tst_QWebEngineProfile::httpAcceptLanguage()
     QWebEnginePage page2(&testProfile);
     QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
     page2.setHtml(QStringLiteral("<html><body>Hello again!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy2.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page2, QStringLiteral("navigator.languages")).toStringList(), QStringList(testLang));
     // Test the old one wasn't affected
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList(), defaultLanguages);
@@ -839,7 +839,7 @@ void tst_QWebEngineProfile::downloadItem()
     QWebEnginePage page(&testProfile);
     QSignalSpy downloadSpy(&testProfile, SIGNAL(downloadRequested(QWebEngineDownloadRequest *)));
     page.load(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()));
-    QTRY_COMPARE(downloadSpy.count(), 1);
+    QTRY_COMPARE(downloadSpy.size(), 1);
 }
 
 void tst_QWebEngineProfile::changePersistentPath()
@@ -965,29 +965,29 @@ void tst_QWebEngineProfile::initiator()
     QWebEnginePage page(&profile, nullptr);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
 
     // about:blank has a unique origin, so initiator should be QUrl("null")
     evaluateJavaScriptSync(&page, "window.location = 'foo:bar'");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
     QCOMPARE(handler.initiator, QUrl("null"));
 
     page.setHtml("", QUrl("http://test:123/foo%20bar"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
 
     // baseUrl determines the origin, so QUrl("http://test:123")
     evaluateJavaScriptSync(&page, "window.location = 'foo:bar'");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
     QCOMPARE(handler.initiator, QUrl("http://test:123"));
 
     // Directly calling load/setUrl should have initiator QUrl(), meaning
     // browser-initiated, trusted.
     page.load(QUrl("foo:bar"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 10000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 10000);
     QCOMPARE(handler.initiator, QUrl());
 }
 
@@ -1003,7 +1003,7 @@ void tst_QWebEngineProfile::badDeleteOrder()
 
     QSignalSpy spyLoadFinished(page, SIGNAL(loadFinished(bool)));
     page->setHtml(QStringLiteral("<html><body><h1>Badly handled page!</h1></body></html>"));
-    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QTRY_COMPARE(spyLoadFinished.size(), 1);
 
     delete profile;
     delete view;
@@ -1019,7 +1019,7 @@ void tst_QWebEngineProfile::qtbug_71895()
     view.page()->profile()->setHttpCacheType(QWebEngineProfile::NoCache);
     view.page()->profile()->cookieStore()->deleteAllCookies();
     view.page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
-    bool gotSignal = loadSpy.count() || loadSpy.wait(20000);
+    bool gotSignal = loadSpy.size() || loadSpy.wait(20000);
     if (!gotSignal)
         QSKIP("Couldn't load page from network, skipping test.");
 }
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 6a97e5db0..ed12fdba0 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -184,7 +184,7 @@ void tst_QWebEngineScript::loadEvents()
 
     // Single frame / setHtml
     page.setHtml(QStringLiteral("<!DOCTYPE html><html><head><title>mr</title></head><body></body></html>"));
-    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.size(), 1, 20000);
     QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
@@ -192,14 +192,14 @@ void tst_QWebEngineScript::loadEvents()
     // After discard
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.size(), 1, 20000);
     QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
 
     // Multiple frames
     page.load(QUrl("qrc:/resources/test_iframe_main.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.size(), 1, 20000);
     QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
@@ -210,7 +210,7 @@ void tst_QWebEngineScript::loadEvents()
 
     // Cross-process navigation
     page.load(QUrl("chrome://gpu"));
-    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.size(), 1, 20000);
     QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
@@ -219,8 +219,8 @@ void tst_QWebEngineScript::loadEvents()
     QVERIFY(profile.pages.size() == 1);
     page.load(QUrl("qrc:/resources/test_window_open.html"));
     QTRY_COMPARE(profile.pages.size(), 2u);
-    QTRY_COMPARE(profile.pages.front().spy.count(), 1);
-    QTRY_COMPARE(profile.pages.back().spy.count(), 1);
+    QTRY_COMPARE(profile.pages.front().spy.size(), 1);
+    QTRY_COMPARE(profile.pages.back().spy.size(), 1);
     QVERIFY(verifyOrder(profile.pages.front().eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(profile.pages.front().eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
     QVERIFY(verifyOrder(profile.pages.back().eval("window.log", QWebEngineScript::MainWorld).toStringList()));
@@ -271,7 +271,7 @@ void tst_QWebEngineScript::scriptDisabled()
     page.scripts().insert(script);
     page.load(QUrl("about:blank"));
     QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     // MainWorld scripts are disabled by the setting...
     QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "foo", QWebEngineScript::MainWorld), QVariant());
@@ -280,7 +280,7 @@ void tst_QWebEngineScript::scriptDisabled()
     page.scripts().clear();
     page.scripts().insert(script);
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     // ...but ApplicationWorld scripts should still work
     QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "foo", QWebEngineScript::MainWorld), QVariant());
@@ -298,7 +298,7 @@ void tst_QWebEngineScript::viewSource()
     page.scripts().insert(script);
     page.load(QUrl("view-source:about:blank"));
     QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().value(0).toBool(), true);
     QCOMPARE(evaluateJavaScriptSync(&page, "foo"), QVariant(42));
 }
@@ -457,7 +457,7 @@ void tst_QWebEngineScript::scriptsInNestedIframes()
     QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
     page.load(QUrl("qrc:/resources/test_iframe_main.html"));
     view.show();
-    QTRY_VERIFY_WITH_TIMEOUT(spyFinished.count() > 0, 20000);
+    QTRY_VERIFY_WITH_TIMEOUT(spyFinished.size() > 0, 20000);
 
     // Check that main frame has modified content.
     QCOMPARE(
@@ -557,22 +557,22 @@ void tst_QWebEngineScript::navigation()
 
     QString url1 = QStringLiteral("about:blank");
     page.setUrl(url1);
-    QTRY_COMPARE(spyTextChanged.count(), 1);
+    QTRY_COMPARE(spyTextChanged.size(), 1);
     QCOMPARE(testObject.text(), url1);
 
     QString url2 = QStringLiteral("chrome://gpu/");
     page.setUrl(url2);
-    QTRY_COMPARE(spyTextChanged.count(), 2);
+    QTRY_COMPARE(spyTextChanged.size(), 2);
     QCOMPARE(testObject.text(), url2);
 
     QString url3 = QStringLiteral("qrc:/resources/test_iframe_main.html");
     page.setUrl(url3);
-    QTRY_COMPARE(spyTextChanged.count(), 3);
+    QTRY_COMPARE(spyTextChanged.size(), 3);
     QCOMPARE(testObject.text(), url3);
 
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     page.setUrl(url1);
-    QTRY_COMPARE(spyTextChanged.count(), 4);
+    QTRY_COMPARE(spyTextChanged.size(), 4);
     QCOMPARE(testObject.text(), url1);
 }
 
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index bd49db7d2..a45799e70 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -304,10 +304,10 @@ void tst_QWebEngineView::changePage()
     QSignalSpy pageFromLoadSpy(pageFrom.get(), &QWebEnginePage::loadFinished);
     QSignalSpy pageFromIconLoadSpy(pageFrom.get(), &QWebEnginePage::iconChanged);
     pageFrom->load(urlFrom);
-    QTRY_COMPARE(pageFromLoadSpy.count(), 1);
+    QTRY_COMPARE(pageFromLoadSpy.size(), 1);
     QCOMPARE(pageFromLoadSpy.last().value(0).toBool(), true);
     if (!fromIsNullPage) {
-        QTRY_COMPARE(pageFromIconLoadSpy.count(), 1);
+        QTRY_COMPARE(pageFromIconLoadSpy.size(), 1);
         QVERIFY(!pageFromIconLoadSpy.last().value(0).isNull());
     }
 
@@ -315,13 +315,13 @@ void tst_QWebEngineView::changePage()
     QCOMPARE(view->page(), pageFrom.get());
     QCOMPARE(QWebEngineView::forPage(pageFrom.get()), view.get());
 
-    QTRY_COMPARE(spyUrl.count(), 1);
+    QTRY_COMPARE(spyUrl.size(), 1);
     QCOMPARE(spyUrl.last().value(0).toUrl(), pageFrom->url());
-    QTRY_COMPARE(spyTitle.count(), 1);
+    QTRY_COMPARE(spyTitle.size(), 1);
     QCOMPARE(spyTitle.last().value(0).toString(), pageFrom->title());
 
-    QTRY_COMPARE(spyIconUrl.count(), fromIsNullPage ? 0 : 1);
-    QTRY_COMPARE(spyIcon.count(), fromIsNullPage ? 0 : 1);
+    QTRY_COMPARE(spyIconUrl.size(), fromIsNullPage ? 0 : 1);
+    QTRY_COMPARE(spyIcon.size(), fromIsNullPage ? 0 : 1);
     if (!fromIsNullPage) {
         QVERIFY(!pageFrom->iconUrl().isEmpty());
         QCOMPARE(spyIconUrl.last().value(0).toUrl(), pageFrom->iconUrl());
@@ -333,10 +333,10 @@ void tst_QWebEngineView::changePage()
     QSignalSpy pageToLoadSpy(pageTo.get(), &QWebEnginePage::loadFinished);
     QSignalSpy pageToIconLoadSpy(pageTo.get(), &QWebEnginePage::iconChanged);
     pageTo->load(urlTo);
-    QTRY_COMPARE(pageToLoadSpy.count(), 1);
+    QTRY_COMPARE(pageToLoadSpy.size(), 1);
     QCOMPARE(pageToLoadSpy.last().value(0).toBool(), true);
     if (!toIsNullPage) {
-        QTRY_COMPARE(pageToIconLoadSpy.count(), 1);
+        QTRY_COMPARE(pageToIconLoadSpy.size(), 1);
         QVERIFY(!pageToIconLoadSpy.last().value(0).isNull());
     }
 
@@ -345,16 +345,16 @@ void tst_QWebEngineView::changePage()
     QCOMPARE(QWebEngineView::forPage(pageTo.get()), view.get());
     QCOMPARE(QWebEngineView::forPage(pageFrom.get()), nullptr);
 
-    QTRY_COMPARE(spyUrl.count(), 2);
+    QTRY_COMPARE(spyUrl.size(), 2);
     QCOMPARE(spyUrl.last().value(0).toUrl(), pageTo->url());
-    QTRY_COMPARE(spyTitle.count(), 2);
+    QTRY_COMPARE(spyTitle.size(), 2);
     QCOMPARE(spyTitle.last().value(0).toString(), pageTo->title());
 
     bool iconIsSame = fromIsNullPage == toIsNullPage;
     int iconChangeNotifyCount = fromIsNullPage ? (iconIsSame ? 0 : 1) : (iconIsSame ? 1 : 2);
 
-    QTRY_COMPARE(spyIconUrl.count(), iconChangeNotifyCount);
-    QTRY_COMPARE(spyIcon.count(), iconChangeNotifyCount);
+    QTRY_COMPARE(spyIconUrl.size(), iconChangeNotifyCount);
+    QTRY_COMPARE(spyIcon.size(), iconChangeNotifyCount);
     QCOMPARE(pageFrom->iconUrl() == pageTo->iconUrl(), iconIsSame);
     if (!iconIsSame) {
         QCOMPARE(spyIconUrl.last().value(0).toUrl(), pageTo->iconUrl());
@@ -365,10 +365,10 @@ void tst_QWebEngineView::changePage()
     // verify no emits on destroy with the same number of signals in spy
     view.reset();
     qApp->processEvents();
-    QTRY_COMPARE(spyUrl.count(), 2);
-    QTRY_COMPARE(spyTitle.count(), 2);
-    QTRY_COMPARE(spyIconUrl.count(), iconChangeNotifyCount);
-    QTRY_COMPARE(spyIcon.count(), iconChangeNotifyCount);
+    QTRY_COMPARE(spyUrl.size(), 2);
+    QTRY_COMPARE(spyTitle.size(), 2);
+    QTRY_COMPARE(spyIconUrl.size(), iconChangeNotifyCount);
+    QTRY_COMPARE(spyIcon.size(), iconChangeNotifyCount);
 }
 
 void tst_QWebEngineView::reusePage_data()
@@ -424,7 +424,7 @@ void tst_QWebEngineView::setLoadedPage()
     QWebEnginePage page;
     QSignalSpy loadSpy(&page, &QWebEnginePage::loadFinished);
     page.setHtml(QString("<html><body bgcolor=\"%1\"></body></html>").arg(QColor(Qt::yellow).name()));
-    QTRY_VERIFY(loadSpy.count() == 1 && loadSpy.first().first().toBool());
+    QTRY_VERIFY(loadSpy.size() == 1 && loadSpy.first().first().toBool());
 
     QWebEngineView view;
     view.resize(480, 320);
@@ -509,7 +509,7 @@ void tst_QWebEngineView::microFocusCoordinates()
     QVariant initialMicroFocus = webView.focusProxy()->inputMethodQuery(Qt::ImCursorRectangle);
 
     evaluateJavaScriptSync(webView.page(), "window.scrollBy(0, 50)");
-    QTRY_VERIFY(scrollSpy.count() > 0);
+    QTRY_VERIFY(scrollSpy.size() > 0);
 
     QTRY_VERIFY(webView.focusProxy()->inputMethodQuery(Qt::ImCursorRectangle).isValid());
     QVariant currentMicroFocus = webView.focusProxy()->inputMethodQuery(Qt::ImCursorRectangle);
@@ -637,7 +637,7 @@ void tst_QWebEngineView::unhandledKeyEventPropagation()
 
     QSignalSpy loadFinishedSpy(&webView, SIGNAL(loadFinished(bool)));
     webView.load(QUrl("qrc:///resources/keyboardEvents.html"));
-    QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.count() > 0, 20000);
+    QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size() > 0, 20000);
 
     evaluateJavaScriptSync(webView.page(), "document.getElementById('first_div').focus()");
     QTRY_COMPARE(evaluateJavaScriptSync(webView.page(), "document.activeElement.id").toString(), QStringLiteral("first_div"));
@@ -695,7 +695,7 @@ void tst_QWebEngineView::horizontalScrollbarTest()
 
     QSignalSpy loadSpy(view.page(), SIGNAL(loadFinished(bool)));
     view.setHtml(html);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QVERIFY(view.page()->scrollPosition() == QPoint(0, 0));
     QSignalSpy scrollSpy(view.page(), SIGNAL(scrollPositionChanged(QPointF)));
@@ -987,7 +987,7 @@ void tst_QWebEngineView::doNotSendMouseKeyboardEventsWhenDisabled()
     QSignalSpy loadSpy(&webView, SIGNAL(loadFinished(bool)));
     webView.setHtml("<html><head><title>Title</title></head><body>Hello"
                     "<input id=\"input\" type=\"text\"></body></html>");
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     // When the webView is enabled, the events are swallowed by it, and the parent widget
     // does not receive any events, otherwise all events are processed by the parent widget.
@@ -1034,7 +1034,7 @@ void tst_QWebEngineView::stopSettingFocusWhenDisabled()
     QSignalSpy loadSpy(&webView, SIGNAL(loadFinished(bool)));
     webView.setHtml("<html><head><title>Title</title></head><body>Hello"
                     "<input id=\"input\" type=\"text\"></body></html>");
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QTRY_COMPARE_WITH_TIMEOUT(webView.hasFocus(), focusResult, 1000);
     evaluateJavaScriptSync(webView.page(), "document.getElementById(\"input\").focus()");
@@ -1163,7 +1163,7 @@ void tst_QWebEngineView::focusInternalRenderWidgetHostViewQuickItem()
     webView->setHtml("<html><body>"
                      "  <input id='input1' type='text'/>"
                      "</body></html>");
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QTRY_COMPARE(webView->hasFocus(), false);
 
     // Manually trigger focus.
@@ -1248,7 +1248,7 @@ void tst_QWebEngineView::changeLocale()
     QWebEngineView viewDE;
     QSignalSpy loadFinishedSpyDE(&viewDE, SIGNAL(loadFinished(bool)));
     viewDE.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyDE.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyDE.size(), 1, 20000);
 
     QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty());
     errorLines = toPlainTextSync(viewDE.page()).split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
@@ -1258,7 +1258,7 @@ void tst_QWebEngineView::changeLocale()
     QWebEngineView viewEN;
     QSignalSpy loadFinishedSpyEN(&viewEN, SIGNAL(loadFinished(bool)));
     viewEN.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyEN.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyEN.size(), 1, 20000);
 
     QTRY_VERIFY(!toPlainTextSync(viewEN.page()).isEmpty());
     errorLines = toPlainTextSync(viewEN.page()).split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
@@ -1271,7 +1271,7 @@ void tst_QWebEngineView::changeLocale()
 
     // Check whether an existing QWebEngineView keeps the language settings after changing the default locale
     viewDE.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyDE.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyDE.size(), 1, 20000);
 
     QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty());
     errorLines = toPlainTextSync(viewDE.page()).split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
@@ -1303,10 +1303,10 @@ void tst_QWebEngineView::mixLangLocale()
     auto sc = connect(view.page(), &QWebEnginePage::renderProcessTerminated, [&] () { terminated = true; });
 
     view.load(QUrl("qrc:///resources/dummy.html"));
-    QTRY_VERIFY(terminated || loadSpy.count() == 1);
+    QTRY_VERIFY(terminated || loadSpy.size() == 1);
 
     QVERIFY2(!terminated,
-        qPrintable(QString("Locale [%1] terminated: %2, loaded: %3").arg(locale).arg(terminated).arg(loadSpy.count())));
+        qPrintable(QString("Locale [%1] terminated: %2, loaded: %3").arg(locale).arg(terminated).arg(loadSpy.size())));
     QVERIFY(loadSpy.first().first().toBool());
 
     QString content = toPlainTextSync(view.page());
@@ -1360,7 +1360,7 @@ void tst_QWebEngineView::inputMethodsTextFormat()
     view.setHtml("<html><body>"
                  " <input type='text' id='input1' style='font-family: serif' value='' maxlength='20'/>"
                  "</body></html>");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     evaluateJavaScriptSync(view.page(), "document.getElementById('input1').focus()");
     view.show();
@@ -1398,7 +1398,7 @@ void tst_QWebEngineView::keyboardEvents()
     view.show();
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
     view.load(QUrl("qrc:///resources/keyboardEvents.html"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
 
     QStringList elements;
     elements << "first_div" << "second_div";
@@ -1529,7 +1529,7 @@ void tst_QWebEngineView::keyboardFocusAfterPopup()
     QTRY_COMPARE(QApplication::focusWidget(), window.webView->focusProxy());
 
     // Keyboard events sent to the window should go to the <input> element.
-    QVERIFY(loadFinishedSpy.count() || loadFinishedSpy.wait());
+    QVERIFY(loadFinishedSpy.size() || loadFinishedSpy.wait());
     QTest::keyPress(QApplication::focusWindow(), Qt::Key_X);
     QTest::keyRelease(QApplication::focusWindow(), Qt::Key_X);
     QTRY_COMPARE(evaluateJavaScriptSync(window.webView->page(), "document.getElementById('input1').value").toString(),
@@ -1560,7 +1560,7 @@ void tst_QWebEngineView::mouseClick()
     textInputCenter = elementCenter(view.page(), "input");
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
     QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input"));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
     QVERIFY(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString().isEmpty());
 
     // Double click
@@ -1575,13 +1575,13 @@ void tst_QWebEngineView::mouseClick()
     textInputCenter = elementCenter(view.page(), "input");
     QTest::mouseMultiClick(view.focusProxy(), textInputCenter, 2);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 1);
+    QCOMPARE(selectionChangedSpy.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input"));
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QStringLiteral("Company"));
 
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 2);
+    QCOMPARE(selectionChangedSpy.size(), 2);
     QVERIFY(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString().isEmpty());
 
     // Triple click
@@ -1596,13 +1596,13 @@ void tst_QWebEngineView::mouseClick()
     textInputCenter = elementCenter(view.page(), "input");
     QTest::mouseMultiClick(view.focusProxy(), textInputCenter, 3);
     QVERIFY(selectionChangedSpy.wait());
-    QTRY_COMPARE(selectionChangedSpy.count(), 2);
+    QTRY_COMPARE(selectionChangedSpy.size(), 2);
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input"));
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QStringLiteral("The Qt Company"));
 
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 3);
+    QCOMPARE(selectionChangedSpy.size(), 3);
     QVERIFY(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString().isEmpty());
 }
 
@@ -1630,12 +1630,12 @@ void tst_QWebEngineView::postData()
 
             // examine request
             QStringList request = lines[0].split(" ", Qt::SkipEmptyParts);
-            bool requestOk = request.length() > 2
+            bool requestOk = request.size() > 2
                           && request[2].toUpper().startsWith("HTTP/")
                           && request[0].toUpper() == "POST"
                           && request[1] == "/";
             if (!requestOk) // POST and HTTP/... can be switched(?)
-                requestOk =  request.length() > 2
+                requestOk =  request.size() > 2
                           && request[0].toUpper().startsWith("HTTP/")
                           && request[2].toUpper() == "POST"
                           && request[1] == "/";
@@ -1643,16 +1643,16 @@ void tst_QWebEngineView::postData()
             // examine headers
             int line = 1;
             bool headersOk = true;
-            for (; headersOk && line < lines.length(); line++) {
+            for (; headersOk && line < lines.size(); line++) {
                 QStringList headerParts = lines[line].split(":");
-                if (headerParts.length() < 2)
+                if (headerParts.size() < 2)
                     break;
                 QString headerKey = headerParts[0].trimmed().toLower();
                 QString headerValue = headerParts[1].trimmed().toLower();
 
                 if (headerKey == "host")
                     headersOk = headersOk && (headerValue == "127.0.0.1")
-                                          && (headerParts.length() == 3)
+                                          && (headerParts.size() == 3)
                                           && (headerParts[2].trimmed()
                                               == QString::number(server.serverPort()));
                 if (headerKey == "content-type")
@@ -1661,12 +1661,12 @@ void tst_QWebEngineView::postData()
 
             // examine body
             bool bodyOk = true;
-            if (lines.length() == line+2) {
+            if (lines.size() == line+2) {
                 QStringList postedFields = lines[line+1].split("&");
                 QMap<QString, QString> postedData;
-                for (int i = 0; bodyOk && i < postedFields.length(); i++) {
+                for (int i = 0; bodyOk && i < postedFields.size(); i++) {
                     QStringList postedField = postedFields[i].split("=");
-                    if (postedField.length() == 2)
+                    if (postedField.size() == 2)
                         postedData[QUrl::fromPercentEncoding(postedField[0].toLocal8Bit())]
                                  = QUrl::fromPercentEncoding(postedField[1].toLocal8Bit());
                     else
@@ -1960,14 +1960,14 @@ void tst_QWebEngineView::inputContextQueryInput()
     view.setHtml("<html><body>"
                  "  <input type='text' id='input1' value='' size='50'/>"
                  "</body></html>");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    QCOMPARE(testContext.infos.count(), 0);
+    QCOMPARE(testContext.infos.size(), 0);
 
     // Set focus on an input field.
     QPoint textInputCenter = elementCenter(view.page(), "input1");
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
-    QTRY_COMPARE(testContext.infos.count(), 2);
+    QTRY_COMPARE(testContext.infos.size(), 2);
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input1"));
     foreach (const InputMethodInfo &info, testContext.infos) {
         QCOMPARE(info.cursorPosition, 0);
@@ -1979,7 +1979,7 @@ void tst_QWebEngineView::inputContextQueryInput()
 
     // Change content of an input field from JavaScript.
     evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value='QtWebEngine';");
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 11);
     QCOMPARE(testContext.infos[0].anchorPosition, 11);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine"));
@@ -1988,7 +1988,7 @@ void tst_QWebEngineView::inputContextQueryInput()
 
     // Change content of an input field by key press.
     QTest::keyClick(view.focusProxy(), Qt::Key_Exclam);
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 12);
     QCOMPARE(testContext.infos[0].anchorPosition, 12);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -1997,7 +1997,7 @@ void tst_QWebEngineView::inputContextQueryInput()
 
     // Change cursor position.
     QTest::keyClick(view.focusProxy(), Qt::Key_Left);
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 11);
     QCOMPARE(testContext.infos[0].anchorPosition, 11);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -2012,8 +2012,8 @@ void tst_QWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("", attributes);
         QApplication::sendEvent(view.focusProxy(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 2);
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 2);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
 
     // As a first step, Chromium moves the cursor to the start of the selection.
     // We don't filter this in QtWebEngine because we don't know yet if this is part of a selection.
@@ -2038,8 +2038,8 @@ void tst_QWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("", attributes);
         QApplication::sendEvent(view.focusProxy(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 1);
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 0);
     QCOMPARE(testContext.infos[0].anchorPosition, 0);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -2053,7 +2053,7 @@ void tst_QWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("123", attributes);
         QApplication::sendEvent(view.focusProxy(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 3);
     QCOMPARE(testContext.infos[0].anchorPosition, 3);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("QtWebEngine!"));
@@ -2067,7 +2067,7 @@ void tst_QWebEngineView::inputContextQueryInput()
         QInputMethodEvent event("", attributes);
         QApplication::sendEvent(view.focusProxy(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 2);
+    QTRY_COMPARE(testContext.infos.size(), 2);
     foreach (const InputMethodInfo &info, testContext.infos) {
         QCOMPARE(info.cursorPosition, 0);
         QCOMPARE(info.anchorPosition, 0);
@@ -2084,7 +2084,7 @@ void tst_QWebEngineView::inputContextQueryInput()
         event.setCommitString(QStringLiteral("123"), 0, 0);
         QApplication::sendEvent(view.focusProxy(), &event);
     }
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QCOMPARE(testContext.infos[0].cursorPosition, 3);
     QCOMPARE(testContext.infos[0].anchorPosition, 3);
     QCOMPARE(testContext.infos[0].surroundingText, QStringLiteral("123QtWebEngine!"));
@@ -2094,7 +2094,7 @@ void tst_QWebEngineView::inputContextQueryInput()
 
     // Focus out.
     QTest::keyPress(view.focusProxy(), Qt::Key_Tab);
-    QTRY_COMPARE(testContext.infos.count(), 1);
+    QTRY_COMPARE(testContext.infos.size(), 1);
     QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral(""));
     testContext.infos.clear();
 }
@@ -2138,7 +2138,7 @@ void tst_QWebEngineView::inputMethods()
         QInputMethodEvent eventText(text, inputAttributes);
         QApplication::sendEvent(view.focusProxy(), &eventText);
         QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString(), text);
-        QCOMPARE(selectionChangedSpy.count(), 0);
+        QCOMPARE(selectionChangedSpy.size(), 0);
     }
 
     {
@@ -2147,7 +2147,7 @@ void tst_QWebEngineView::inputMethods()
         eventText.setCommitString(text, 0, 0);
         QApplication::sendEvent(view.focusProxy(), &eventText);
         QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString(), text);
-        QCOMPARE(selectionChangedSpy.count(), 0);
+        QCOMPARE(selectionChangedSpy.size(), 0);
     }
 
     // ImMaximumTextLength
@@ -2223,24 +2223,24 @@ void tst_QWebEngineView::textSelectionInInputField()
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 11);
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 11);
     // There was no selection to be changed by the click
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     QList<QInputMethodEvent::Attribute> attributes;
     QInputMethodEvent event(QString(), attributes);
     event.setCommitString("XXX", 0, 0);
     QApplication::sendEvent(view.focusProxy(), &event);
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("QtWebEngineXXX"));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     event.setCommitString(QString(), -2, 2); // Erase two characters.
     QApplication::sendEvent(view.focusProxy(), &event);
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("QtWebEngineX"));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     event.setCommitString(QString(), -1, 1); // Erase one character.
     QApplication::sendEvent(view.focusProxy(), &event);
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("QtWebEngine"));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     // Move to the start of the line
     QTest::keyClick(view.focusProxy(), Qt::Key_Home);
@@ -2252,7 +2252,7 @@ void tst_QWebEngineView::textSelectionInInputField()
     // Select to the end of the line
     QTest::keyClick(view.focusProxy(), Qt::Key_End, Qt::ShiftModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 1);
+    QCOMPARE(selectionChangedSpy.size(), 1);
 
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 2);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 11);
@@ -2262,7 +2262,7 @@ void tst_QWebEngineView::textSelectionInInputField()
     // Deselect the selection (this moves the current cursor to the end of the text)
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 2);
+    QCOMPARE(selectionChangedSpy.size(), 2);
 
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 11);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 11);
@@ -2275,7 +2275,7 @@ void tst_QWebEngineView::textSelectionInInputField()
     // Select to the start of the line
     QTest::keyClick(view.focusProxy(), Qt::Key_Home, Qt::ShiftModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 3);
+    QCOMPARE(selectionChangedSpy.size(), 3);
 
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 9);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 0);
@@ -2297,34 +2297,34 @@ void tst_QWebEngineView::textSelectionOutOfInputField()
     QVERIFY(loadFinishedSpy.wait());
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 
     // Simple click should not update text selection, however it updates selection bounds in Chromium
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, view.geometry().center());
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 
     // Select text by ctrl+a
     QTest::keyClick(view.windowHandle(), Qt::Key_A, Qt::ControlModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 1);
+    QCOMPARE(selectionChangedSpy.size(), 1);
     QVERIFY(view.hasSelection());
     QCOMPARE(view.page()->selectedText(), QString("This is a text"));
 
     // Deselect text by mouse click
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, view.geometry().center());
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 2);
+    QCOMPARE(selectionChangedSpy.size(), 2);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 
     // Select text by ctrl+a
     QTest::keyClick(view.windowHandle(), Qt::Key_A, Qt::ControlModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 3);
+    QCOMPARE(selectionChangedSpy.size(), 3);
     QVERIFY(view.hasSelection());
     QCOMPARE(view.page()->selectedText(), QString("This is a text"));
 
@@ -2333,7 +2333,7 @@ void tst_QWebEngineView::textSelectionOutOfInputField()
     view.page()->setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     view.show();
     QVERIFY(loadFinishedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 4);
+    QCOMPARE(selectionChangedSpy.size(), 4);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 
@@ -2346,7 +2346,7 @@ void tst_QWebEngineView::textSelectionOutOfInputField()
     QVERIFY(loadFinishedSpy.wait());
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 
@@ -2357,7 +2357,7 @@ void tst_QWebEngineView::textSelectionOutOfInputField()
     // Select the whole page by ctrl+a
     QTest::keyClick(view.windowHandle(), Qt::Key_A, Qt::ControlModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 1);
+    QCOMPARE(selectionChangedSpy.size(), 1);
     QVERIFY(view.hasSelection());
     QVERIFY(view.page()->selectedText().startsWith(QString("This is a text")));
 
@@ -2366,21 +2366,21 @@ void tst_QWebEngineView::textSelectionOutOfInputField()
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
     QVERIFY(selectionChangedSpy.wait());
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input1"));
-    QCOMPARE(selectionChangedSpy.count(), 2);
+    QCOMPARE(selectionChangedSpy.size(), 2);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 
     // Select the content of the input field by ctrl+a
     QTest::keyClick(view.windowHandle(), Qt::Key_A, Qt::ControlModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 3);
+    QCOMPARE(selectionChangedSpy.size(), 3);
     QVERIFY(view.hasSelection());
     QCOMPARE(view.page()->selectedText(), QString("QtWebEngine"));
 
     // Deselect input field's text by mouse click
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, view.geometry().center());
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 4);
+    QCOMPARE(selectionChangedSpy.size(), 4);
     QVERIFY(!view.hasSelection());
     QVERIFY(view.page()->selectedText().isEmpty());
 }
@@ -2427,7 +2427,7 @@ void tst_QWebEngineView::emptyInputMethodEvent()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     evaluateJavaScriptSync(view.page(), "var inputEle = document.getElementById('input1'); inputEle.focus(); inputEle.select();");
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
 
     // 1. Empty input method event does not clear text
     QInputMethodEvent emptyEvent;
@@ -2476,7 +2476,7 @@ void tst_QWebEngineView::imeComposition()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     evaluateJavaScriptSync(view.page(), "var inputEle = document.getElementById('input1'); inputEle.focus(); inputEle.select();");
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
 
     // Clear the selection, also cancel the ongoing composition if there is one.
     {
@@ -2486,7 +2486,7 @@ void tst_QWebEngineView::imeComposition()
         QInputMethodEvent event("", attributes);
         QApplication::sendEvent(view.focusProxy(), &event);
         selectionChangedSpy.wait();
-        QCOMPARE(selectionChangedSpy.count(), 2);
+        QCOMPARE(selectionChangedSpy.size(), 2);
     }
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("QtWebEngine inputMethod"));
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 0);
@@ -2507,7 +2507,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 0);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 0);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     // Send temporary text, which makes the editor has composition 'n'.
     {
@@ -2519,7 +2519,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 0);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 0);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     // Send commit text, which makes the editor conforms composition.
     {
@@ -2532,7 +2532,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 1);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 1);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
 
     // 2. insert a character to the middle of the line.
@@ -2546,7 +2546,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 1);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 1);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     // Send commit text, which makes the editor conforms composition.
     {
@@ -2559,7 +2559,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 2);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 2);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
 
     // 3. Insert a character to the end of the line.
@@ -2577,7 +2577,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 25);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 25);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
     // Send commit text, which makes the editor conforms composition.
     {
@@ -2590,7 +2590,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 26);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 26);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 
 
     // 4. Replace the selection.
@@ -2600,7 +2600,7 @@ void tst_QWebEngineView::imeComposition()
     QTest::keyClick(view.focusProxy(), Qt::Key_Left, Qt::ShiftModifier | Qt::AltModifier);
 #endif
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 1);
+    QCOMPARE(selectionChangedSpy.size(), 1);
 
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("oeQtWebEngine inputMethodt"));
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 14);
@@ -2614,7 +2614,7 @@ void tst_QWebEngineView::imeComposition()
         QApplication::sendEvent(view.focusProxy(), &event);
         // The new composition should clear the previous selection
         QVERIFY(selectionChangedSpy.wait());
-        QCOMPARE(selectionChangedSpy.count(), 2);
+        QCOMPARE(selectionChangedSpy.size(), 2);
     }
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QString("oeQtWebEngine "));
     // The cursor should be positioned at the end of the composition text
@@ -2634,7 +2634,7 @@ void tst_QWebEngineView::imeComposition()
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCursorPosition).toInt(), 15);
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 15);
     QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
-    QCOMPARE(selectionChangedSpy.count(), 2);
+    QCOMPARE(selectionChangedSpy.size(), 2);
     selectionChangedSpy.clear();
 
 
@@ -2676,7 +2676,7 @@ void tst_QWebEngineView::imeComposition()
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImAnchorPosition).toInt(), 11);
     QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImCurrentSelection).toString(), QString(""));
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString(), QString("QtWebEngine"));
-    QCOMPARE(selectionChangedSpy.count(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
 }
 
 void tst_QWebEngineView::newlineInTextarea()
@@ -2831,7 +2831,7 @@ void tst_QWebEngineView::imeJSInputEvents()
     }
 
     // Simply committing text should not trigger any JS composition event.
-    QTRY_COMPARE(logLines().count(), 3);
+    QTRY_COMPARE(logLines().size(), 3);
     QCOMPARE(logLines()[0], QStringLiteral("[object InputEvent] beforeinput commit"));
     QCOMPARE(logLines()[1], QStringLiteral("[object TextEvent] textInput commit"));
     QCOMPARE(logLines()[2], QStringLiteral("[object InputEvent] input commit"));
@@ -2847,7 +2847,7 @@ void tst_QWebEngineView::imeJSInputEvents()
         qApp->processEvents();
     }
 
-    QTRY_COMPARE(logLines().count(), 4);
+    QTRY_COMPARE(logLines().size(), 4);
     QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
     QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
     QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
@@ -2861,7 +2861,7 @@ void tst_QWebEngineView::imeJSInputEvents()
         qApp->processEvents();
     }
 
-    QTRY_COMPARE(logLines().count(), 9);
+    QTRY_COMPARE(logLines().size(), 9);
     QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput commit"));
     QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate commit"));
     QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput commit"));
@@ -2879,7 +2879,7 @@ void tst_QWebEngineView::imeJSInputEvents()
         qApp->processEvents();
     }
 
-    QTRY_COMPARE(logLines().count(), 4);
+    QTRY_COMPARE(logLines().size(), 4);
     QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
     QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
     QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
@@ -2892,7 +2892,7 @@ void tst_QWebEngineView::imeJSInputEvents()
         qApp->processEvents();
     }
 
-    QTRY_COMPARE(logLines().count(), 9);
+    QTRY_COMPARE(logLines().size(), 9);
     QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput "));
     QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate "));
     QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput "));
@@ -3024,20 +3024,20 @@ void tst_QWebEngineView::globalMouseSelection()
 
     // Select text via JavaScript
     evaluateJavaScriptSync(view.page(), "var inputEle = document.getElementById('input1'); inputEle.focus(); inputEle.select();");
-    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QTRY_COMPARE(selectionChangedSpy.size(), 1);
     QVERIFY(QApplication::clipboard()->text(QClipboard::Selection).isEmpty());
 
     // Deselect the selection (this moves the current cursor to the end of the text)
     QPoint textInputCenter = elementCenter(view.page(), "input1");
     QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, textInputCenter);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 2);
+    QCOMPARE(selectionChangedSpy.size(), 2);
     QVERIFY(QApplication::clipboard()->text(QClipboard::Selection).isEmpty());
 
     // Select to the start of the line
     QTest::keyClick(view.focusProxy(), Qt::Key_Home, Qt::ShiftModifier);
     QVERIFY(selectionChangedSpy.wait());
-    QCOMPARE(selectionChangedSpy.count(), 3);
+    QCOMPARE(selectionChangedSpy.size(), 3);
     QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QStringLiteral("QtWebEngine"));
 }
 #endif
@@ -3063,7 +3063,7 @@ void tst_QWebEngineView::noContextMenu()
     QTest::mouseMove(wrapper.windowHandle(), QPoint(10,10));
     QTest::mouseClick(wrapper.windowHandle(), Qt::RightButton);
 
-    QTRY_COMPARE(wrapper.findChildren<QMenu *>().count(), 1);
+    QTRY_COMPARE(wrapper.findChildren<QMenu *>().size(), 1);
     QVERIFY(view.findChildren<QMenu *>().isEmpty());
 }
 
@@ -3103,7 +3103,7 @@ void tst_QWebEngineView::contextMenu()
     view.load(QUrl("about:blank"));
     view.resize(640, 480);
     view.show();
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QVERIFY(view.findChildren<QMenu *>().isEmpty());
     QTest::mouseMove(view.windowHandle(), QPoint(10,10));
@@ -3111,9 +3111,9 @@ void tst_QWebEngineView::contextMenu()
 
     // verify for zero children will always succeed, so should be tested with at least minor timeout
     if (childrenCount <= 0) {
-        QVERIFY(!QTest::qWaitFor([&view] () { return view.findChildren<QMenu *>().count() > 0; }, 500));
+        QVERIFY(!QTest::qWaitFor([&view] () { return view.findChildren<QMenu *>().size() > 0; }, 500));
     } else {
-        QTRY_COMPARE(view.findChildren<QMenu *>().count(), childrenCount);
+        QTRY_COMPARE(view.findChildren<QMenu *>().size(), childrenCount);
         if (isCustomMenu) {
             QCOMPARE(view.findChildren<QMenu *>().first(), customMenu);
         }
@@ -3268,7 +3268,7 @@ void tst_QWebEngineView::webUIURLs()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
     view.load(url);
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 90000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 90000);
     QCOMPARE(loadFinishedSpy.takeFirst().at(0).toBool(), supported);
 }
 
@@ -3277,7 +3277,7 @@ void tst_QWebEngineView::visibilityState()
     QWebEngineView view;
     QSignalSpy spy(&view, &QWebEngineView::loadFinished);
     view.load(QStringLiteral("about:blank"));
-    QVERIFY(spy.count() || spy.wait());
+    QVERIFY(spy.size() || spy.wait());
     QVERIFY(spy.takeFirst().takeFirst().toBool());
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.visibilityState").toString(), QStringLiteral("hidden"));
     view.show();
@@ -3292,7 +3292,7 @@ void tst_QWebEngineView::visibilityState2()
     view.show();
     view.load(QStringLiteral("about:blank"));
     view.hide();
-    QVERIFY(spy.count() || spy.wait());
+    QVERIFY(spy.size() || spy.wait());
     QVERIFY(spy.takeFirst().takeFirst().toBool());
     QCOMPARE(evaluateJavaScriptSync(view.page(), "document.visibilityState").toString(), QStringLiteral("hidden"));
 }
@@ -3305,8 +3305,8 @@ void tst_QWebEngineView::visibilityState3()
     QSignalSpy spy2(&page2, &QWebEnginePage::loadFinished);
     page1.load(QStringLiteral("about:blank"));
     page2.load(QStringLiteral("about:blank"));
-    QVERIFY(spy1.count() || spy1.wait());
-    QVERIFY(spy2.count() || spy2.wait());
+    QVERIFY(spy1.size() || spy1.wait());
+    QVERIFY(spy2.size() || spy2.wait());
     QWebEngineView view;
     view.setPage(&page1);
     view.show();
@@ -3370,7 +3370,7 @@ void tst_QWebEngineView::deletePage()
     QVERIFY(view.page());
     QSignalSpy spy(view.page(), &QWebEnginePage::loadFinished);
     view.page()->load(QStringLiteral("about:blank"));
-    QTRY_VERIFY(spy.count());
+    QTRY_VERIFY(spy.size());
 }
 
 void tst_QWebEngineView::autoDeleteOnExternalPageDelete()
@@ -3384,7 +3384,7 @@ void tst_QWebEngineView::autoDeleteOnExternalPageDelete()
     view->show();
     view->resize(320, 240);
     page->load(QUrl("about:blank"));
-    QTRY_VERIFY(spy.count());
+    QTRY_VERIFY(spy.size());
     QVERIFY(page->parent() != view);
 
     auto sc = QObject::connect(page, &QWebEnginePage::destroyed, view, &QWebEngineView::deleteLater);
@@ -3417,7 +3417,7 @@ void tst_QWebEngineView::closeOpenerTab()
     testView->settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
     QSignalSpy loadFinishedSpy(testView, SIGNAL(loadFinished(bool)));
     testView->setUrl(QStringLiteral("about:blank"));
-    QTRY_VERIFY(loadFinishedSpy.count());
+    QTRY_VERIFY(loadFinishedSpy.size());
     testView->page()->runJavaScript(QStringLiteral("window.open('about:blank','_blank')"));
     QTRY_COMPARE(testView->createdWindows.size(), 1);
     auto *newView = testView->createdWindows.at(0);
@@ -3442,7 +3442,7 @@ void tst_QWebEngineView::switchPage()
       QWebEngineView webView2(&page2, nullptr);
       page1.setHtml("<html><body bgcolor=\"#000000\"></body></html>");
       page2.setHtml("<html><body bgcolor=\"#ffffff\"></body></html>");
-      QTRY_VERIFY(loadFinishedSpy1.count() && loadFinishedSpy2.count());
+      QTRY_VERIFY(loadFinishedSpy1.size() && loadFinishedSpy2.size());
       QWebEngineView webView;
       webView.resize(300,300);
       webView.show();
@@ -3539,7 +3539,7 @@ void tst_QWebEngineView::loadAfterRendererCrashed()
 
     QSignalSpy loadSpy(&view, &QWebEngineView::loadFinished);
     view.load(QUrl("qrc:///resources/dummy.html"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
     QVERIFY(loadSpy.first().first().toBool());
 }
 
@@ -3557,7 +3557,7 @@ void tst_QWebEngineView::inspectElement()
 
     QSignalSpy spy(&view, &QWebEngineView::loadFinished);
     view.load(QUrl("data:text/plain,foobarbaz"));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 12000);
 
     // shouldn't do anything since inspector is not attached
     page->triggerAction(QWebEnginePage::InspectElement);
@@ -3609,7 +3609,7 @@ void tst_QWebEngineView::navigateOnDrop()
 
     sendEvents();
     if (navigateOnDrop) {
-        QTRY_COMPARE(loadSpy.count(), 1);
+        QTRY_COMPARE(loadSpy.size(), 1);
         QVERIFY(loadSpy.last().first().toBool());
         QCOMPARE(view.url(), url);
     } else {
@@ -3622,11 +3622,11 @@ void tst_QWebEngineView::navigateOnDrop()
     loadSpy.clear();
     view.page()->settings()->setAttribute(QWebEngineSettings::NavigateOnDropEnabled, !navigateOnDrop);
     view.setUrl(QUrl("about:blank"));
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     sendEvents();
     if (!navigateOnDrop) {
-        QTRY_COMPARE(loadSpy.count(), 2);
+        QTRY_COMPARE(loadSpy.size(), 2);
         QVERIFY(loadSpy.last().first().toBool());
         QCOMPARE(view.url(), url);
     } else {
@@ -3657,7 +3657,7 @@ void tst_QWebEngineView::datalist()
 
     QSignalSpy loadSpy(&view, &QWebEngineView::loadFinished);
     view.setHtml(html);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QTRY_COMPARE(loadSpy.size(), 1);
 
     QString listValuesJS("(function() {"
                          "  var browserDatalist = document.getElementById('browserDatalist');"
diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
index bb9cecae5..c643a56ba 100644
--- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
@@ -151,7 +151,7 @@ void tst_Spellchecking::spellcheck()
     QTest::mousePress(m_view->focusWidget(), Qt::LeftButton, {}, QPoint(20,20));
     QTest::mouseRelease(m_view->focusWidget(), Qt::LeftButton, {}, QPoint(20,20));
     QString text("I lowe Qt ....");
-    for (int i = 0; i < text.length(); i++) {
+    for (int i = 0; i < text.size(); i++) {
         QTest::keyClicks(m_view->focusWidget(), text.at(i));
         QTest::qWait(60);
     }
-- 
cgit v1.2.3


From 7b8d7df089a7105a89fd7fd049f06318843106a0 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 11 Nov 2022 16:26:04 +0100
Subject: Port from qAsConst() to std::as_const()

We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

This is a 6.4 re-run of the script we ran in dev, in order to avoid
conflicts between the branches when cherry-picking.

Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp | 2 +-
 tests/auto/httpserver/httpserver.cpp                                | 2 +-
 tests/auto/quick/publicapi/tst_publicapi.cpp                        | 4 ++--
 tests/manual/quick/touchbrowser/main.cpp                            | 2 +-
 tests/quicktestbrowser/main.cpp                                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index 44c56561d..8b6822148 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -306,7 +306,7 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
     (void) httpServer.stop();
 
     QCOMPARE(resourceFirstParty.size(), accessTested.loadAcquire());
-    for (auto &&p : qAsConst(resourceFirstParty))
+    for (auto &&p : std::as_const(resourceFirstParty))
         QVERIFY2(p.second == firstPartyUrl,
                  qPrintable(QString("Resource [%1] has wrong firstPartyUrl: %2").arg(p.first.toString(), p.second.toString())));
 }
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index 30320950a..e08af77e7 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -80,7 +80,7 @@ void HttpServer::handleNewConnection()
         // if request wasn't handled or purposely ignored for default behavior
         // then try to serve htmls from resources dirs if set
         if (rr->requestMethod() == "GET") {
-            for (auto &&dir : qAsConst(m_dirs)) {
+            for (auto &&dir : std::as_const(m_dirs)) {
                 QFile f(dir + rr->requestPath());
                 if (f.exists()) {
                     if (f.open(QFile::ReadOnly)) {
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 75c7cd4f7..371969b2a 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -892,12 +892,12 @@ void tst_publicapi::publicAPI()
     // Uncomment to print the actual API.
     // QStringList sortedAPI(actualAPI);
     // std::sort(sortedAPI.begin(), sortedAPI.end());
-    // for (const QString &actual : qAsConst(sortedAPI))
+    // for (const QString &actual : std::as_const(sortedAPI))
     //     printf("    << \"%s\"\n", qPrintable(actual));
 
     bool apiMatch = true;
     // Make sure that nothing slips in the public API unintentionally.
-    for (const QString &actual : qAsConst(actualAPI)) {
+    for (const QString &actual : std::as_const(actualAPI)) {
         if (!expectedAPI.contains(actual)) {
             qWarning("Expected list is not up-to-date: %ls", qUtf16Printable(actual));
             apiMatch = false;
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index b63f3b31c..7b222038e 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -17,7 +17,7 @@ static QUrl startupUrl()
     QUrl ret;
     QStringList args(qApp->arguments());
     args.takeFirst();
-    for (const QString &arg : qAsConst(args)) {
+    for (const QString &arg : std::as_const(args)) {
         if (arg.startsWith(QLatin1Char('-')))
              continue;
         ret = Utils::fromUserInput(arg);
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index 2d4fa544e..c41eb2f56 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -22,7 +22,7 @@ static QUrl startupUrl()
     QUrl ret;
     QStringList args(qApp->arguments());
     args.takeFirst();
-    for (const QString &arg : qAsConst(args)) {
+    for (const QString &arg : std::as_const(args)) {
         if (arg.startsWith(QLatin1Char('-')))
              continue;
         ret = Utils::fromUserInput(arg);
-- 
cgit v1.2.3


From f5e29a03bd90ccaee7aa20a40b7792f95b52334b Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 2 Nov 2022 17:08:44 +0100
Subject: Add client SSL authentication test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our qwebenginecertificatestore unit test so far only tested
adding/removing custom certificates into the memory. However,
it never actually initialized certificate store and did
not test if ssl certificate client authentication really works.

Cover that case and client authentication test.
Note ca and client certificates in the test are self signed to
be able to run test without network connection, however
we ignore the errors.

Change-Id: I4df4fdfabed5abd8f8bde7d4c0c79b5fd7f6f3a9
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 37da356e7b7ec11f486589dce4a230b36c53c7a3)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../core/certificateerror/tst_certificateerror.cpp |  2 +-
 .../CMakeLists.txt                                 | 10 +++++
 .../resources/ca.pem                               | 24 +++++++++++
 .../resources/client.key                           | 27 ++++++++++++
 .../resources/client.pem                           | 22 ++++++++++
 .../resources/server.key                           | 27 ++++++++++++
 .../resources/server.pem                           | 22 ++++++++++
 .../tst_qwebengineclientcertificatestore.cpp       | 48 ++++++++++++++++++++++
 tests/auto/httpserver/httpsserver.h                | 19 +++++++--
 tests/auto/quick/qmltests/tst_qmltests.cpp         |  5 ++-
 10 files changed, 200 insertions(+), 6 deletions(-)
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/ca.pem
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/client.key
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/client.pem
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/server.key
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/server.pem

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 9ad2c03ee..67e2d8ae4 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -67,7 +67,7 @@ void tst_CertificateError::handleError_data()
 
 void tst_CertificateError::handleError()
 {
-    HttpsServer server(":/resources/server.pem",":/resources/server.key");
+    HttpsServer server(":/resources/server.pem", ":/resources/server.key", "");
     server.setExpectError(false);
     QVERIFY(server.start());
 
diff --git a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
index fa2d5e538..2569b3b29 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
+++ b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
@@ -1,8 +1,13 @@
+include(../../httpserver/httpserver.cmake)
+include(../../util/util.cmake)
+
 qt_internal_add_test(tst_qwebengineclientcertificatestore
     SOURCES
         tst_qwebengineclientcertificatestore.cpp
     LIBRARIES
         Qt::WebEngineCore
+        Test::HttpServer
+        Test::Util
 )
 
 set(tst_qwebengineclientcertificatestore_resource_files
@@ -10,6 +15,11 @@ set(tst_qwebengineclientcertificatestore_resource_files
     "resources/certificate1.crt"
     "resources/privatekey.key"
     "resources/privatekey1.key"
+    "resources/server.pem"
+    "resources/server.key"
+    "resources/client.pem"
+    "resources/client.key"
+    "resources/ca.pem"
 )
 
 qt_internal_add_resource(tst_qwebengineclientcertificatestore "tst_qwebengineclientcertificatestore"
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/ca.pem b/tests/auto/core/qwebengineclientcertificatestore/resources/ca.pem
new file mode 100644
index 000000000..cb62ad62c
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/ca.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIECzCCAvOgAwIBAgIUdhDW1WgGxF313LYA0JjEQpKbanQwDQYJKoZIhvcNAQEL
+BQAwgZQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEXMBUGA1UECgwOVGhlIFF0IENvbXBhbnkxFDASBgNVBAsMC1F0V2ViRW5n
+aW5lMRIwEAYDVQQDDAl3d3cucXQuaW8xIDAeBgkqhkiG9w0BCQEWEXF0d2ViZW5n
+aW5lQHF0LmlvMB4XDTIyMTExNjExMDQxNFoXDTMyMTExMzExMDQxNFowgZQxCzAJ
+BgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEXMBUG
+A1UECgwOVGhlIFF0IENvbXBhbnkxFDASBgNVBAsMC1F0V2ViRW5naW5lMRIwEAYD
+VQQDDAl3d3cucXQuaW8xIDAeBgkqhkiG9w0BCQEWEXF0d2ViZW5naW5lQHF0Lmlv
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxyNLLwAA+FgNQavVJ19n
+gdoy+NKLHQyhzcRFykKSp9aAbpAR6e4ukxwG7mWNBcuR7zv1Zw/JqLFE0gmVztVw
+FeQWdw1cvTN/OlVEuM+0ShTDHHsCqRpx7/XJT6ytMKVU8jdZN4Vl1m7MubWv4aPy
+0WYYd3zIAicciYgy/RHaRhPTKpPzWIPYhmHsM5w2cebL8I0aZXUkC0OeklJArnp9
+007Fr6SXXK0xQ3RO20n7X193gCfd5U70lug0ks/ZZqxtzPHmzIO1WGAOBura50HR
+hxUKAu7qQHzBiW5Qwdn0af4FPLJR/SX8ADKTLCSWlMOo1FLYO5w6D8hB4K6/b9VQ
+RwIDAQABo1MwUTAdBgNVHQ4EFgQUXuTuB85/iBgwJpLdOc+8TB0KESIwHwYDVR0j
+BBgwFoAUXuTuB85/iBgwJpLdOc+8TB0KESIwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAvtucUJa0IECltWv8U6R+LQuZ1Q+ubbmstojO/h8tg6Wf
+v6FZ5bH3oboSyGEcytRr6INf4G6znUNAypbodehAEW6/PETdzGM9CJyv2JPJAWzV
+rxb1H5VTyiEs8924QOqcNATD+oe7G0vwnDkvprcqaWBA6yvQkWpCXoqMc+F95KnY
+8VFt2VQw17l4L4nhaX3Us6hJLMiKV+dLeF0pN+pkCPRP9G5WKgW3mT2U6Gig+rLz
+6L7rBbb5KWAttdAbuHCrMa65PgXoVD1P/GteFxUnghDd0PWgUaign8c/DyHGsrbA
+uvJqSym0kmQQXptryRaKFsGcCrizdbE6FfrH2iE7vQ==
+-----END CERTIFICATE-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/client.key b/tests/auto/core/qwebengineclientcertificatestore/resources/client.key
new file mode 100644
index 000000000..21c8e3183
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/client.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAqnHbq38y1VprEaV2xXzv2nAPyjqCuIfuick8qETkzEsNWPQi
+dsBlLfcyf+15wEMhpRIwILXCrUM7Sb7WCGtg1XC00JZvCh2xPBMSD2fiQyHn4men
+Fwh9vVbTf1v7w21ZT/pXQrwlgLgNWYZHE3JrcEAwlThQRIdQfzSE6/QeHfYZoGB9
+WfvbREsOWiUlZze/yrblS9vnAVhYwVurelc7lXyHA0dHmkcZ0HwMxVJZ/vLuCyIw
+lNGT/ytnA9p1l8uFkAgTcbWZKoyJAsAZG9faZp46hk8+e3KAyKQ78aoUSbjAqnNQ
+tBM3bnHeHanf3ddCxyej+k9PfSIY27a9FZxHpQIDAQABAoIBAFsomA8p8ZsQR9Fh
+SJupDXMrmhZTotRkxxxkR4/LgP8OaO4ZbFFM5xBldFndPc+pV9Y8WwczjxIxsgTo
+Dvrjyx98rwgcXPjxFniFzpP0wJudB7McMs5r2SwpwuYL4SQNWMYgowjrLbehOGqY
+GW16NaIMgq9cNfng0RmnkivMHUtyE5GGdK+C6cyK+fIE+cNtQtHPRKfEnwbE9VHz
+3EY/nCXGZvMFyj5uHaU4EeZFCzo19TUqhh8H7b0EA44pBtb5U/CxsH4xphZ7rpjt
+iVjMfRSMR4qalQNIs6ZEj57We+M/zca/Qq1yhjW+0NYbZifcYo1Oj6e4lC9YlIgn
+kGkcuUECgYEA1j0iVFjgBXS8pJP3jBgmbrbBBTNEUv27yjnJCAQx5TbplJkvBM4/
+qzum1uH2o6uRrFtrYJFiAhDHARtg+70rMeYqZp8WFvzJT5c5s+FOmGQPfFjgrD6e
+wfnCwFzS7nohJ8TM2mPGJ88pBv0eBYW6D0f7fvcJmEk8hnGktdLRCrECgYEAy6tU
+YFZDzGhbgrG2wWzBvAKVngUNhrYZHMiF1WVN8zZdCm7Z8b1S/NMe0rPA5orhAkSX
+8fxlDfKOm+U2fKp43aiN0NDiP0TlGRbypAXe7FSnvDxNHbV+Ie0UbwuiJ4s3vJuc
+6cdzgKqAs5/rjPXPdUpM8C7344HV7azgSzHIYTUCgYAtVmCmcuxtmye0uG+BoTa4
+5UnxvMivu2x7PkFRxfl9JWLHBKfTn4YPyZ7kCIu2VT+NtwcBN6MDBuPmUxHyFDVI
+6Ql+EBqPoM1FX55hd8O3Mi2oxfI94T6dlCpnpP0qZIQRs28apFSx5gArr3Mj/gnC
+5BvP4Z2RMaZyWShfJg8A8QKBgQClZEhswyDjiYtmorJqeMsKxn6BiFDnqFDUUvJ7
+zHx0mR0NL9/Es54Eud059ccccIMwuEs7s17M6MBuUMDik/z647nmbPqNroDs0vnP
+wQS6njRoY/+rtIrtOf1x/9x6iE+G1keigNmHDu7c72z1V1hVQzUfhsS+99yl2dF6
+vr6eUQKBgF/OHW1bE3FruZ+53Arcb94N/IKnpH9VWoB3elIzr0w6pLtL4HHhmQ58
+TayEpq6YguUAjTvCBbaHuYuKPHiXCAy5DhtrXvP4YdMNH9X1nHc7jVEbGltVbnQU
+bG/p5YfZSrDmsjf8w0z7feFOcovC6vF1YCXc8OHK/LQ6JFJ/gtO1
+-----END RSA PRIVATE KEY-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/client.pem b/tests/auto/core/qwebengineclientcertificatestore/resources/client.pem
new file mode 100644
index 000000000..dd1f898f7
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/client.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApcCFFNQAgGBu5nr81tUMdXXLGkm8Li+MA0GCSqGSIb3DQEBCwUAMIGU
+MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4x
+FzAVBgNVBAoMDlRoZSBRdCBDb21wYW55MRQwEgYDVQQLDAtRdFdlYkVuZ2luZTES
+MBAGA1UEAwwJd3d3LnF0LmlvMSAwHgYJKoZIhvcNAQkBFhFxdHdlYmVuZ2luZUBx
+dC5pbzAeFw0yMjExMTYxMjExMDFaFw0zMjExMTMxMjExMDFaMIGSMQswCQYDVQQG
+EwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xFzAVBgNVBAoM
+DlRoZSBRdCBDb21wYW55MRQwEgYDVQQLDAtRdFdlYkVuZ2luZTEVMBMGA1UEAwwM
+Y2xpZW50LnF0LmlvMRswGQYJKoZIhvcNAQkBFgxjbGllbnRAcXQuaW8wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqcdurfzLVWmsRpXbFfO/acA/KOoK4
+h+6JyTyoROTMSw1Y9CJ2wGUt9zJ/7XnAQyGlEjAgtcKtQztJvtYIa2DVcLTQlm8K
+HbE8ExIPZ+JDIefiZ6cXCH29VtN/W/vDbVlP+ldCvCWAuA1ZhkcTcmtwQDCVOFBE
+h1B/NITr9B4d9hmgYH1Z+9tESw5aJSVnN7/KtuVL2+cBWFjBW6t6VzuVfIcDR0ea
+RxnQfAzFUln+8u4LIjCU0ZP/K2cD2nWXy4WQCBNxtZkqjIkCwBkb19pmnjqGTz57
+coDIpDvxqhRJuMCqc1C0Ezducd4dqd/d10LHJ6P6T099Ihjbtr0VnEelAgMBAAEw
+DQYJKoZIhvcNAQELBQADggEBALE75ZQxmEXJA16cNAxxmxCKHkaqAE6Ulim1vXNH
+jCFfNCDGYn/R28F3BVtMe+bIMoomaTh3h5eOd/9uc2nm8IiT5FUz9epJWPeRG/cl
+I+hQ3fvaE7oJ3m3EwfGq1mdqUf1zi+DFjtkimNbn9ZRDocZfpO5VN0u23ptEuk0P
+5cH4+Dst0giRMv5W0kXG6QD13H/eVH3jDZCtZa/8T4oxGGskHEa4yDr8s976lVOV
+XLI1r7oN4a/KXKow8WN3oHFeKn4QJx86z1uecuZLtT8xjABKSWpZqgsIlmGTGE1a
+9W06C+uPVamwn5ND3gnf93YQqn6PwrjlHdrQOTG/vngJLPw=
+-----END CERTIFICATE-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/server.key b/tests/auto/core/qwebengineclientcertificatestore/resources/server.key
new file mode 100644
index 000000000..632cc4d2e
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/server.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA5gQoJryenjmvzy4RbqHdNXHK8Gk/8Lto1SwT8+Wbh5EyYRTt
+hFdioT1JYcIe3XMwOmx3TjADY1jAXAPfeRcjTkMcnZwF76AXUK2XqBANhaG1wjsi
+b7ISGU/U5/Jarm2iwQJ5zjKsNm8pZYqpmKsYAVFMErtfcpdLdSp6BG54SrbItcXh
+WHfsUs5cuVEi9nCeugLkDzoPLlj/TeouKWOdzhyvLXkPvPmD4/hD0dULTXpCDZhf
+73AuQBWTGsWeUnJQiQhDRwuXWhGRX8qFJQ4rzY8rIbaKhge+BQ6BL+pij2uzHKNQ
+j12ZLFZgLihLDJogGp08y9Ud6Ru/3WGoFkY38wIDAQABAoIBABM/TczQA8XhteB0
+Tmkfik8qknzDkeInDIKqCZFjKTyS3dBZ2/YzCcHMSxOvFr4ZIXQCF4mnYuExUAdj
+G5QaZ43o98AIikae8tSBcitSDI+eFIOIRz1pfTI5B+vQz93AttnHx0GF4/s6GhCx
+JbfsuTmDAAahPz9rgZjwUP2F8PLvaAZqJrXBPY+QLWz0SN2zh6vWAHPbJA0sO/4E
+oWUhRPXJDf33YCFxnwtbUBie5313suAfNspODcyH+AxBH2FFh63pe0ZGOhX7XFMJ
+yxJqujeZrQdfwFZNPXAPVLJGbd7AIOrVE+O8/bYUB/uuj6pPJBqr+Ob/JhY48pRb
+VG2qL4ECgYEA9n3PuL13F9XFcLeergGH7fUcSQeD1T6Z1qaI2Wth0Umfmer/fFZh
+IKSCSwEGMTLsalFdlTj8jsSAasjuSorQTeSgHjzvzik1Ll2P6syputjsD1RX/nkl
+8L50Pwdeey57Y9dgow7Cw/heGYs6dkXLe9H6qM7eoB8Vrk7/TAFuqNECgYEA7uOl
+oKyOxeLn005cenc5enY2IxDhXTaAjTGHE64C0lmicD2OZB7/b+ZIb8M5R7GnCNox
+4TxLSRhZYOMO/QcTrnSND5PXbX/HLd3nyQRIN1XtBbg7pJooxP/MQ/Ne5XTTMjCg
+qPudkOe0ZgUHEcuH8m/YAFY3DDJC50uiXqYtxYMCgYBHfL+ExbZHfGExyp9Duf/x
+PHhCmeJbMzessEnaPLF24FJgcm48YlTzAaMkG5zvIeS9BPIOOCPPSCAyWCn8BnxZ
+SuhBPM0TzpG067+0ijzjiswTuhN3Iy2kv6e5K+rz8MwqbamCQOKtsVehMub2rFFS
+jNiUosKgT8Oa9SBHq9arMQKBgQCE3EVEnFP3iOAILH/QeLiV/GLVk9DTR7mtTUtj
+zZayKLnoFMQ5uOe182x8BCa6UfqlOL0fGKqCZ7Fl6kJuxV3T2+yMKlxZAQTk5JLB
+wMjtRbPCR5mcTUS5c87GR/eSRCwlsNfZw775VXSGfOtWoUzlsACBB3IsLVP6UZ1n
+aKLyQwKBgC61BvKiyGBEYIchqMI4dSF+zCJbSjNUtjwVobcgC6yERZtX2OeLFCoh
+NEf9CcL2Eqb+RzwAD3OV65AiZcrThQNXZ8poBxvwWK8I6E6zB+LX7POAvNu/AV/5
+ANnxwHGGLqi+wTcdMZal2iXkdsrno1Ek/nGMCdA7IVs7l5k7fEpG
+-----END RSA PRIVATE KEY-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/server.pem b/tests/auto/core/qwebengineclientcertificatestore/resources/server.pem
new file mode 100644
index 000000000..4706fa73e
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/server.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApcCFFNQAgGBu5nr81tUMdXXLGkm8Li/MA0GCSqGSIb3DQEBCwUAMIGU
+MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4x
+FzAVBgNVBAoMDlRoZSBRdCBDb21wYW55MRQwEgYDVQQLDAtRdFdlYkVuZ2luZTES
+MBAGA1UEAwwJd3d3LnF0LmlvMSAwHgYJKoZIhvcNAQkBFhFxdHdlYmVuZ2luZUBx
+dC5pbzAeFw0yMjExMTYxMjExMTRaFw0zMjExMTMxMjExMTRaMIGSMQswCQYDVQQG
+EwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xFzAVBgNVBAoM
+DlRoZSBRdCBDb21wYW55MRQwEgYDVQQLDAtRdFdlYkVuZ2luZTEVMBMGA1UEAwwM
+c2VydmVyLnF0LmlvMRswGQYJKoZIhvcNAQkBFgxzZXJ2ZXJAcXQuaW8wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmBCgmvJ6eOa/PLhFuod01ccrwaT/w
+u2jVLBPz5ZuHkTJhFO2EV2KhPUlhwh7dczA6bHdOMANjWMBcA995FyNOQxydnAXv
+oBdQrZeoEA2FobXCOyJvshIZT9Tn8lqubaLBAnnOMqw2bylliqmYqxgBUUwSu19y
+l0t1KnoEbnhKtsi1xeFYd+xSzly5USL2cJ66AuQPOg8uWP9N6i4pY53OHK8teQ+8
++YPj+EPR1QtNekINmF/vcC5AFZMaxZ5SclCJCENHC5daEZFfyoUlDivNjyshtoqG
+B74FDoEv6mKPa7Mco1CPXZksVmAuKEsMmiAanTzL1R3pG7/dYagWRjfzAgMBAAEw
+DQYJKoZIhvcNAQELBQADggEBAHotgaBbqIlG4EqjzSpX8kQnZnGJUsA51dbY3K5C
+4tNCd+JquQfPmCIKDHkRsmmEU6pcU+LT8m+toJ8Gx0XG4nrdUIDt0Nlf/QrykbPj
+hN8z+aSfP9J5tg4NsT7qMWmqUHOa3BcsgWcC4IwWVkbOMz/XbczEQqdBJMbE0+PC
+32ihTKPZBPC2QlIvXyuwupvQtcXgEjw1r2FQeYcmItk3CKbJPE/Rk4/aXSCo4b0F
+iXPphh8BJPZVvQ2cLpPaGvcse5qjIhF9ODb2HEK3myMwuJVi7teURy8mPlS23Li/
+8gRCNu/stjMlkic7d3dqV0LwaG8+Df1W2wzxsT7IkxN/Z+o=
+-----END CERTIFICATE-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
index defa06319..404791332 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
+++ b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
@@ -1,9 +1,14 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include <httpsserver.h>
+#include <util.h>
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebengineclientcertificatestore.h>
+#include <QtWebEngineCore/qwebenginepage.h>
 #include <QtWebEngineCore/qwebengineprofile.h>
+#include <QtWebEngineCore/qwebenginecertificateerror.h>
+#include <QtWebEngineCore/qwebenginesettings.h>
 
 class tst_QWebEngineClientCertificateStore : public QObject
 {
@@ -16,6 +21,7 @@ public:
 private Q_SLOTS:
     void addAndListCertificates();
     void removeAndClearCertificates();
+    void clientAuthentication();
 };
 
 tst_QWebEngineClientCertificateStore::tst_QWebEngineClientCertificateStore()
@@ -69,5 +75,47 @@ void tst_QWebEngineClientCertificateStore::removeAndClearCertificates()
     QCOMPARE(0, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 }
 
+void tst_QWebEngineClientCertificateStore::clientAuthentication()
+{
+    HttpsServer server(":/resources/server.pem", ":/resources/server.key", ":resources/ca.pem");
+    server.setExpectError(false);
+    QVERIFY(server.start());
+
+    connect(&server, &HttpsServer::newRequest, [&](HttpReqRep *rr) {
+        rr->setResponseBody(QByteArrayLiteral("<html><body>TEST</body></html>"));
+        rr->sendResponse();
+    });
+
+    QFile certFile(":/resources/client.pem");
+    certFile.open(QIODevice::ReadOnly);
+    const QSslCertificate cert(certFile.readAll(), QSsl::Pem);
+
+    QFile keyFile(":/resources/client.key");
+    keyFile.open(QIODevice::ReadOnly);
+    const QSslKey sslKey(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, "");
+
+    QWebEngineProfile profile("clientAuthentication");
+    profile.clientCertificateStore()->add(cert, sslKey);
+    QWebEnginePage page(&profile);
+    connect(&page, &QWebEnginePage::certificateError, [](QWebEngineCertificateError e) {
+        // ca is self signed in this test simply accept the certificate error
+        e.acceptCertificate();
+    });
+    connect(&page, &QWebEnginePage::selectClientCertificate, &page,
+            [&cert](QWebEngineClientCertificateSelection selection) {
+                QVERIFY(!selection.certificates().isEmpty());
+                const QSslCertificate &sCert = selection.certificates().at(0);
+                QVERIFY(cert == sCert);
+                selection.select(sCert);
+            });
+    QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
+    page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
+    page.setUrl(server.url());
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size() > 0, true, 20000);
+    QCOMPARE(loadFinishedSpy.takeFirst().at(0).toBool(), true);
+    QCOMPARE(toPlainTextSync(&page), QStringLiteral("TEST"));
+    QVERIFY(server.stop());
+}
+
 QTEST_MAIN(tst_QWebEngineClientCertificateStore)
 #include "tst_qwebengineclientcertificatestore.moc"
diff --git a/tests/auto/httpserver/httpsserver.h b/tests/auto/httpserver/httpsserver.h
index 2982ed8c4..10deeb322 100644
--- a/tests/auto/httpserver/httpsserver.h
+++ b/tests/auto/httpserver/httpsserver.h
@@ -13,7 +13,8 @@
 #include <QtNetwork/qsslconfiguration.h>
 #include <QtNetwork/qsslserver.h>
 
-static QSslServer *createServer(const QString &certificateFileName, const QString &keyFileName)
+static QSslServer *createServer(const QString &certificateFileName, const QString &keyFileName,
+                                const QString &ca)
 {
     QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
 
@@ -36,6 +37,16 @@ static QSslServer *createServer(const QString &certificateFileName, const QStrin
         qCritical() << "Could not find certificate: " << certificateFileName;
     }
 
+    if (!ca.isEmpty()) {
+        QList<QSslCertificate> caCerts = QSslCertificate::fromPath(ca);
+        if (!caCerts.isEmpty()) {
+            configuration.addCaCertificates(caCerts);
+            configuration.setPeerVerifyMode(QSslSocket::VerifyPeer);
+        } else {
+            qCritical() << "Could not find certificate: " << certificateFileName;
+        }
+    }
+
     QSslServer *server = new QSslServer();
     server->setSslConfiguration(configuration);
     return server;
@@ -43,8 +54,10 @@ static QSslServer *createServer(const QString &certificateFileName, const QStrin
 
 struct HttpsServer : HttpServer
 {
-    HttpsServer(const QString &certPath, const QString &keyPath, QObject *parent = nullptr)
-        : HttpServer(createServer(certPath, keyPath), "https", QHostAddress::LocalHost, 0, parent)
+    HttpsServer(const QString &certPath, const QString &keyPath, const QString &ca,
+                QObject *parent = nullptr)
+        : HttpServer(createServer(certPath, keyPath, ca), "https", QHostAddress::LocalHost, 0,
+                     parent)
     {
     }
 };
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index bfa411416..0d9e12cd6 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -253,8 +253,9 @@ int main(int argc, char **argv)
 
 #if QT_CONFIG(ssl)
     qmlRegisterSingletonType<HttpsServer>(
-            "Test.Shared", 1, 0, "HttpsServer",
-            [&](QQmlEngine *, QJSEngine *) { return new HttpsServer(":/resources/server.pem",":/resources/server.key"); });
+            "Test.Shared", 1, 0, "HttpsServer", [&](QQmlEngine *, QJSEngine *) {
+                return new HttpsServer(":/resources/server.pem", ":/resources/server.key", "");
+            });
 #endif
     Setup setup;
     int i = quick_test_main_with_setup(
-- 
cgit v1.2.3


From 8d66c76a01d5fbbdea501d902aa80449ccb799df Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 19 Sep 2022 16:09:14 +0200
Subject: Return both application and system certificates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the certificate choice return both application and
system certificates.

Add unit test to cover the case on Linux.
Unfortunately it requires adding the user certificate to
the nss data store, which is not not nice, however porting
the certificate manger from Chromium is a bigger task.

Test runs only if the machine has pk12utils installed.

During the test the user certificate is imported into
the nss database with the nickname 'qwebengineclientcertificatestore'.

This can be removed later with:
ninja remove-user-personal-certificate

and verified with:
certutil -d sql:$HOME/.pki/nssdb -L

Change-Id: I475fddc68ea56304980f6c835ed4cfed4b093ad4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit daaac7adb519e82b21a2f826ef6ae83c4f102a62)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../CMakeLists.txt                                 |  40 +++++++++++++
 .../resources/client2.key                          |  27 +++++++++
 .../resources/client2.p12                          | Bin 0 -> 2549 bytes
 .../resources/client2.pem                          |  22 ++++++++
 .../tst_qwebengineclientcertificatestore.cpp       |  62 ++++++++++++++++++---
 5 files changed, 143 insertions(+), 8 deletions(-)
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/client2.key
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12
 create mode 100644 tests/auto/core/qwebengineclientcertificatestore/resources/client2.pem

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
index 2569b3b29..55908d8e8 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
+++ b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
@@ -19,6 +19,8 @@ set(tst_qwebengineclientcertificatestore_resource_files
     "resources/server.key"
     "resources/client.pem"
     "resources/client.key"
+    "resources/client2.pem"
+    "resources/client2.key"
     "resources/ca.pem"
 )
 
@@ -29,3 +31,41 @@ qt_internal_add_resource(tst_qwebengineclientcertificatestore "tst_qwebenginecli
         ${tst_qwebengineclientcertificatestore_resource_files}
 )
 
+if(LINUX)
+
+    get_filename_component(homePath $ENV{HOME} ABSOLUTE)
+
+    find_program(pk12util_EXECUTABLE NAMES pk12util)
+
+    if(pk12util_EXECUTABLE)
+        add_custom_command(
+            DEPENDS resources/client2.p12
+            COMMAND ${pk12util_EXECUTABLE}
+                -d sql:"${homePath}/.pki/nssdb"
+                -n qwebengineclientcertificatestore
+                -i "${CMAKE_CURRENT_LIST_DIR}/resources/client2.p12"
+                -W \"\"
+            COMMAND ${CMAKE_COMMAND} -E touch pk12util.stamp
+            OUTPUT pk12util.stamp
+        )
+        add_custom_target(
+            add-user-personal-certificate
+            DEPENDS pk12util.stamp
+    )
+    qt_internal_extend_target(tst_qwebengineclientcertificatestore DEFINES TEST_NSS)
+    add_dependencies(tst_qwebengineclientcertificatestore  add-user-personal-certificate)
+    endif()
+
+    find_program(certutil_EXECUTABLE NAMES certutil)
+
+    if(certutil_EXECUTABLE)
+        add_custom_target(remove-user-personal-certificate
+            COMMAND ${certutil_EXECUTABLE}
+                -d sql:"${homePath}/.pki/nssdb"
+                -D
+                -n qwebengineclientcertificatestore
+            COMMAND ${CMAKE_COMMAND} -E remove pk12util.stamp
+        )
+    endif()
+endif()
+
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/client2.key b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.key
new file mode 100644
index 000000000..3c1346519
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAv0vrzULGwDJBoZgnGXdkMFxCvkTqqQYCE/LlNtStLJfJH7Fo
+CgenVFcJ8RIFHdkL7HeFAIZjDLSjIp2Ud41fd+VsaGgB/+j1/UeEN8nkArvYB9ol
+OnKGq6CbSrCocrLo2o2X+6eyLtrtLG6RLr8/UiqB2OWNAdnw70S5RCvnbV6phr8z
+bgYqPdPSBaedfZk5Kj6yM6XvIKSK6IjgZuo+Z5SyabJqk2VhaBlB7mjCf3Mj4zPD
+XvQXsAq0ZNQXQVwKRfJ2I9uAeNAZiQP5i00pBqe2kIJEKnk8qbP4/Jho2Tp8XSBC
+jHMn0oWrAZyO9vw3W940qmqmdRftyt+J8DO9xwIDAQABAoIBAGBpXTCYRR88tQNC
+cgJNv/r3pNPMXBBP7OAs/QUDbzwYS89jVDIp5VWGgIY1NMr0RyQooKnBEU6oA8hA
+b0FJySHeSSLduJRHzyKV1rdfU0Fldt2OPlEUw3bgfSPJoTwdm2n7DuxQemdPA1Xv
+a9CJpto8fjDYkJasRtfwZQdMsVjXCfQ/cCzkOkblUDZcc7yTx3uiBKF8Jy8C+0qc
+98btotYU88KWoE9A0ucWt/ik68MjYmccO6PYXKerNW2Ijgd1kik35G3TbEWxOFWW
+y3zLFtfoD+21SdUgTMzM06owDVfSt/MER4tOxFyUPRuze7BJXrBofGQfuPiGiPuK
+f5QZP8ECgYEA+x1PkClsqtRnjrzmRfi3OFez1Kbbzneucg5ssWR+Hd4EUFhhO42q
+te1ZYoydy09tEqd002U7e5hob0/o+rVK9jldpZszMCBfVDYCDqdtw5rNI89bL1Uz
+8krn6nk3BBx42lgAFU4C1JEaur4r14OOUtoFfRTAwjogQHcDmpyPNjcCgYEAwwSv
+FJAKRjw1oOXKlGotoeYEAREVxH9HFnfM5IcVwcwMt+KUFEyrMtXeH1gk7jo+2ev4
+87njQ8hU3VPObCUcnTJHi2a6D9JIY+zA9bKTJjc8drcBathipmwtak14TsX2qe14
+JBIKlC3V0h1FqM3ep76p4dnt7sTmVc7ZOqBR7PECgYEA1HQE94wEkzdnch0hmbuG
+kBWrYNPXDgS1w2uuzBqglPZcoflUMkV2U7s+r6EWc4d8WZbxwVRZkgTs/pgWHd66
+UD1SnKUFFsecv6t97BX9SMu0mYJ6vD4S2ABF3Fu3jzPjj596WowI2vz1J19zyj9U
+b4ZjtGKVfv4cgU3v76RbidsCgYAx4CvKzX/jMJjimoJx7KnZAxO5Fh6ED60loOQE
++ktlMgN6r/cBLg6GxM23JHrldn4Gi+QyqTLnbf/OTxW28NLdnTNRAqfJThV3gOBk
+thQOLQhIsEsrgUXRnE8NJd0EAHsyQGp+hyKvfP13bEcZgfVU311hRrQkYbUq8uj5
+pnDtcQKBgEFIpP7EzdJWrVOUjnjMQloqBhW8KVVtNwI5bmlcsUvVYjfZph016SiF
+UTfZss1KkBmQClAVtyZsrKIfObIJ9KJ4hPAzzk+ca1D6XTLsYjxPwtB/U0ewB2Dm
+yMxkXpT1kAiJ2Tdr1hZ8OcQhvnGWmrhtz+AkjyLXiYgST7Hubrxt
+-----END RSA PRIVATE KEY-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12 b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12
new file mode 100644
index 000000000..feccd77e1
Binary files /dev/null and b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12 differ
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/client2.pem b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.pem
new file mode 100644
index 000000000..39c0b3f09
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDsTCCApkCFFNQAgGBu5nr81tUMdXXLGkm8LjBMA0GCSqGSIb3DQEBCwUAMIGU
+MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4x
+FzAVBgNVBAoMDlRoZSBRdCBDb21wYW55MRQwEgYDVQQLDAtRdFdlYkVuZ2luZTES
+MBAGA1UEAwwJd3d3LnF0LmlvMSAwHgYJKoZIhvcNAQkBFhFxdHdlYmVuZ2luZUBx
+dC5pbzAeFw0yMjExMTYxOTIwMzBaFw0zMjExMTMxOTIwMzBaMIGUMQswCQYDVQQG
+EwJERTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xFzAVBgNVBAoM
+DlRoZSBRdCBDb21wYW55MRQwEgYDVQQLDAtRdFdlYkVuZ2luZTEWMBQGA1UEAwwN
+Y2xpZW50Mi5xdC5pbzEcMBoGCSqGSIb3DQEJARYNY2xpZW50MkBxdC5pbzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9L681CxsAyQaGYJxl3ZDBcQr5E
+6qkGAhPy5TbUrSyXyR+xaAoHp1RXCfESBR3ZC+x3hQCGYwy0oyKdlHeNX3flbGho
+Af/o9f1HhDfJ5AK72AfaJTpyhqugm0qwqHKy6NqNl/unsi7a7SxukS6/P1Iqgdjl
+jQHZ8O9EuUQr521eqYa/M24GKj3T0gWnnX2ZOSo+sjOl7yCkiuiI4GbqPmeUsmmy
+apNlYWgZQe5own9zI+Mzw170F7AKtGTUF0FcCkXydiPbgHjQGYkD+YtNKQantpCC
+RCp5PKmz+PyYaNk6fF0gQoxzJ9KFqwGcjvb8N1veNKpqpnUX7crfifAzvccCAwEA
+ATANBgkqhkiG9w0BAQsFAAOCAQEAic8F8q1TpP2ufnBRbrBp54Jgddl/zdVb7O3M
+AAK67KiEpEr9xPPVcIowfns1ZTIsIB8D4VS4NQGJXBrwvGWL08SpSmi76I1E156x
+9Hql0PHXCjqsJTOSEvljIgQ4sp33zs0DTmlyejSSGnG9sw2FtcYAGZNV+ImAhTO2
+DNxw3BnF++ilHsQbiWIKD5z14bOXb77SJrimup0YBzfwBWJO013k8g8lkiRRs5Ng
+XYVr3NoTLcIJQ7BTFu4W1Wegxwrw3fQZ98BBlCVh0htrOcLpWKelJeI16MgZA/7T
+P4MwvN5tkyjqrcsrDORldR6JKdX8i+GLF49MgRW4QispcZzoYA==
+-----END CERTIFICATE-----
diff --git a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
index 404791332..7d82a5640 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
+++ b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
@@ -19,8 +19,11 @@ public:
     ~tst_QWebEngineClientCertificateStore();
 
 private Q_SLOTS:
+    void init();
+    void cleanup();
     void addAndListCertificates();
     void removeAndClearCertificates();
+    void clientAuthentication_data();
     void clientAuthentication();
 };
 
@@ -32,6 +35,19 @@ tst_QWebEngineClientCertificateStore::~tst_QWebEngineClientCertificateStore()
 {
 }
 
+void tst_QWebEngineClientCertificateStore::init()
+{
+    QCOMPARE(0,
+             QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
+}
+
+void tst_QWebEngineClientCertificateStore::cleanup()
+{
+    QWebEngineProfile::defaultProfile()->clientCertificateStore()->clear();
+    QCOMPARE(0,
+             QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
+}
+
 void tst_QWebEngineClientCertificateStore::addAndListCertificates()
 {
     // Load QSslCertificate
@@ -63,6 +79,7 @@ void tst_QWebEngineClientCertificateStore::addAndListCertificates()
 
 void tst_QWebEngineClientCertificateStore::removeAndClearCertificates()
 {
+    addAndListCertificates();
     QCOMPARE(2, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 
     // Remove one certificate from in-memory store
@@ -75,8 +92,29 @@ void tst_QWebEngineClientCertificateStore::removeAndClearCertificates()
     QCOMPARE(0, QWebEngineProfile::defaultProfile()->clientCertificateStore()->certificates().size());
 }
 
+void tst_QWebEngineClientCertificateStore::clientAuthentication_data()
+{
+    QTest::addColumn<QString>("client_certificate");
+    QTest::addColumn<QString>("client_key");
+    QTest::addColumn<bool>("in_memory");
+    QTest::addColumn<bool>("add_more_in_memory_certificates");
+    QTest::newRow("in_memory") << ":/resources/client.pem"
+                               << ":/resources/client.key" << true << false;
+#if defined(TEST_NSS)
+    QTest::newRow("nss") << ":/resources/client2.pem"
+                         << ":/resources/client2.key" << false << false;
+    QTest::newRow("in_memory + nss") << ":/resources/client2.pem"
+                                     << ":/resources/client2.key" << false << true;
+#endif
+}
+
 void tst_QWebEngineClientCertificateStore::clientAuthentication()
 {
+    QFETCH(QString, client_certificate);
+    QFETCH(QString, client_key);
+    QFETCH(bool, in_memory);
+    QFETCH(bool, add_more_in_memory_certificates);
+
     HttpsServer server(":/resources/server.pem", ":/resources/server.key", ":resources/ca.pem");
     server.setExpectError(false);
     QVERIFY(server.start());
@@ -86,17 +124,21 @@ void tst_QWebEngineClientCertificateStore::clientAuthentication()
         rr->sendResponse();
     });
 
-    QFile certFile(":/resources/client.pem");
+    QFile certFile(client_certificate);
     certFile.open(QIODevice::ReadOnly);
     const QSslCertificate cert(certFile.readAll(), QSsl::Pem);
 
-    QFile keyFile(":/resources/client.key");
+    QFile keyFile(client_key);
     keyFile.open(QIODevice::ReadOnly);
     const QSslKey sslKey(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, "");
 
-    QWebEngineProfile profile("clientAuthentication");
-    profile.clientCertificateStore()->add(cert, sslKey);
-    QWebEnginePage page(&profile);
+    if (in_memory)
+        QWebEngineProfile::defaultProfile()->clientCertificateStore()->add(cert, sslKey);
+
+    if (add_more_in_memory_certificates)
+        addAndListCertificates();
+
+    QWebEnginePage page;
     connect(&page, &QWebEnginePage::certificateError, [](QWebEngineCertificateError e) {
         // ca is self signed in this test simply accept the certificate error
         e.acceptCertificate();
@@ -104,9 +146,13 @@ void tst_QWebEngineClientCertificateStore::clientAuthentication()
     connect(&page, &QWebEnginePage::selectClientCertificate, &page,
             [&cert](QWebEngineClientCertificateSelection selection) {
                 QVERIFY(!selection.certificates().isEmpty());
-                const QSslCertificate &sCert = selection.certificates().at(0);
-                QVERIFY(cert == sCert);
-                selection.select(sCert);
+                for (const QSslCertificate &sCert : selection.certificates()) {
+                    if (cert == sCert) {
+                        selection.select(sCert);
+                        return;
+                    }
+                }
+                QFAIL("No certificate found.");
             });
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
-- 
cgit v1.2.3


From 74553e682c6bfae4d7084b34e2bddef94464d67d Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 25 Aug 2022 12:25:46 +0200
Subject: Reduce slowness and flakiness of tst_origin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This test runs very slow and it is flaky. Make it run faster by:

* instead of doing timeout checks for "cannotLoad", introduce
<image> element add use 'onload' and 'onerror' handlers before
doing actual <iframe> load, this dropps a need for hardcoded
delay/deadline for ifrme being loaded.
* do not evaluate JavaScript in try wait loop , use JavaScript
messages instead.

Note that using <img> or <script> element to perform the test (which
have onload and onerros handler unlike iframe) ie. loading cross origin
scripts or images instead of iframes is a dead-end as it has different
results and "canLoadButNotAccess" can not be tested as origin BAR can
load a script from origin FOO, but it still works in BAR‘s context.

Task-number: QTBUG-105342
Change-Id: I180aea801cedb0f97b96cb90a54b793d0a7c1a7f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit ffc09328c9774548e378a3187ea0d386cc31de3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/core/origins/CMakeLists.txt             |   1 +
 .../auto/core/origins/resources/mixedSchemes.html  |  29 ++++++++++++++-------
 .../core/origins/resources/mixedSchemes_frame.html |   9 ++++---
 tests/auto/core/origins/resources/red.png          | Bin 0 -> 146 bytes
 tests/auto/core/origins/tst_origins.cpp            |  28 +++++++++++++-------
 5 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 tests/auto/core/origins/resources/red.png

(limited to 'tests')

diff --git a/tests/auto/core/origins/CMakeLists.txt b/tests/auto/core/origins/CMakeLists.txt
index 79b8278a7..e25e616c5 100644
--- a/tests/auto/core/origins/CMakeLists.txt
+++ b/tests/auto/core/origins/CMakeLists.txt
@@ -29,6 +29,7 @@ set(tst_origins_resource_files
     "resources/viewSource.html"
     "resources/websocket.html"
     "resources/websocket2.html"
+    "resources/red.png"
 )
 
 qt_internal_add_resource(tst_origins "tst_origins"
diff --git a/tests/auto/core/origins/resources/mixedSchemes.html b/tests/auto/core/origins/resources/mixedSchemes.html
index 53c8c83ff..3e50c2c3b 100644
--- a/tests/auto/core/origins/resources/mixedSchemes.html
+++ b/tests/auto/core/origins/resources/mixedSchemes.html
@@ -6,23 +6,34 @@
          var result;
          var canary;
 
-         function setIFrameUrl(url) {
+         function setIFrameUrl(frameUrl,imgUrl) {
              result = undefined;
              canary = undefined;
-             document.getElementById("iframe").setAttribute("src", url);
-             // Early fire is OK unless the test is expecting cannotLoad.
-             // If timeout is too short then a false positive is possible.
-             setTimeout(() => { result = result || "cannotLoad"; }, 3000);
+             let img = document.createElement('img');
+             img.onerror = function() {
+                 console.log("TEST:cannotLoad");
+                 console.log("TEST:done");
+             };
+             img.onload = function() {
+                 document.getElementById("iframe").setAttribute("src", frameUrl);
+             };
+             img.src = imgUrl
          }
 
          addEventListener("load", function() {
              document.getElementById("iframe").addEventListener("load", function() {
-                 if (canary && window[0].canary)
-                     result = "canLoadAndAccess";
-                 else
-                     result = "canLoadButNotAccess";
+                 if (canary && window[0].canary) {
+                     console.log("TEST:canLoadAndAccess");
+                     console.log("TEST:done");
+                 } else {
+                     console.log("TEST:canLoadButNotAccess");
+                     console.log("TEST:done");
+                 }
              });
          });
+         window.onerror = function(message, url, line, col, errorObj) {
+             return true;
+         };
         </script>
     </head>
     <body>
diff --git a/tests/auto/core/origins/resources/mixedSchemes_frame.html b/tests/auto/core/origins/resources/mixedSchemes_frame.html
index 40ace2d2f..9499caa1f 100644
--- a/tests/auto/core/origins/resources/mixedSchemes_frame.html
+++ b/tests/auto/core/origins/resources/mixedSchemes_frame.html
@@ -3,9 +3,12 @@
     <head>
         <title>Mixed - Frame</title>
         <script>
-         console.log('Frame Loaded');
-         var canary = true;
-         parent.canary = true;
+         try{
+             var canary = true;
+             parent.canary = true;
+         }catch(exception){
+         };
+
         </script>
     </head>
     <body></body>
diff --git a/tests/auto/core/origins/resources/red.png b/tests/auto/core/origins/resources/red.png
new file mode 100644
index 000000000..5ae85192b
Binary files /dev/null and b/tests/auto/core/origins/resources/red.png differ
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index cef9c31d5..626030fe7 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -1005,9 +1005,14 @@ void tst_Origins::mixedContent()
 
     auto setIFrameUrl = [&] (const QString &scheme) {
         if (scheme == "data")
-            return QString("setIFrameUrl('data:,<script>var canary = true; parent.canary = true</script>')");
+            return QString("setIFrameUrl('data:,<script>var canary = true; parent.canary = "
+                           "true</script>','data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAAAUA"
+                           "AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/"
+                           "w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==')");
         auto frameUrl = QString("%1:%2/resources/mixedSchemes_frame.html").arg(scheme).arg(scheme == "file" ? srcDir : "");
-        return QString("setIFrameUrl('%1')").arg(frameUrl);
+        auto imgUrl =
+                QString("%1:%2/resources/red.png").arg(scheme).arg(scheme == "file" ? srcDir : "");
+        return QString("setIFrameUrl('%1','%2')").arg(frameUrl).arg(imgUrl);
     };
 
     m_page->messages.clear();
@@ -1019,15 +1024,18 @@ void tst_Origins::mixedContent()
 
         eval(setIFrameUrl(schemeTo));
 
-        QTRY_COMPARE(eval(QSL("result !== undefined")), QVariant(true));
-        auto result = eval(QSL("result")).toString();
-        // Work-around some combinations missing JS loaded signals:
-        if (m_page->messages.size() > 0) {
-            if (m_page->messages[0] == QSL("Frame Loaded") && result == QSL("cannotLoad"))
-                result = QSL("canLoadButNotAccess");
-            m_page->messages.clear();
+        // wait for token in the log
+        QTRY_VERIFY(m_page->messages.contains("TEST:done"));
+        QString result;
+        // make sure we do not have some extra logs from blink
+        for (auto message : m_page->messages) {
+            QStringList s = message.split(':');
+            if (s.size() > 1 && s[0] == "TEST") {
+                result = s[1];
+                break;
+            }
         }
-
+        m_page->messages.clear();
         schemesTo.append(schemeTo.rightJustified(20));
         results.append(result.rightJustified(20));
         expected.append(expectedResult.rightJustified(20));
-- 
cgit v1.2.3


From 9d7403eb74130608223d2fb3eb14c3aeb7e5ccd2 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 5 Sep 2022 13:41:11 +0200
Subject: Rewrite mixedSchemes test

Follow the same 'test' pattern we have in other tests.

Note that this and previous change make test suite for tst_origin
execute faster form ~170s to ~60s for desktop linux and
from ~320s to ~140s for qemu.

Task-number: QTBUG-105342
Change-Id: I5cd0aa0a76fcc2d005cee398a88ba4099f9881c3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit dfc19ad0804fe45dab19ffdf46084e9e4be24f0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/core/origins/tst_origins.cpp | 228 ++++++++++++++++++++------------
 1 file changed, 142 insertions(+), 86 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 626030fe7..c3efb4bc7 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -262,6 +262,23 @@ public:
         messages << message;
         qCDebug(lc) << message;
     }
+
+    bool logContainsDoneMarker() const { return messages.contains("TEST:done"); }
+
+    QString findResultInLog() const
+    {
+        // make sure we do not have some extra logs from blink
+        for (auto message : messages) {
+            QStringList s = message.split(':');
+            if (s.size() > 1 && s[0] == "TEST")
+                return s[1];
+        }
+        return QString();
+    }
+
+    void clearLog() { messages.clear(); }
+
+private:
     QStringList messages;
 };
 
@@ -281,6 +298,7 @@ private Q_SLOTS:
     void subdirWithoutAccess();
     void fileAccessRemoteUrl_data();
     void fileAccessRemoteUrl();
+    void mixedSchemes_data();
     void mixedSchemes();
     void mixedSchemesWithCsp();
     void mixedXHR_data();
@@ -607,89 +625,135 @@ void tst_Origins::fileAccessRemoteUrl()
 // Additionally for unregistered custom schemes and custom schemes without
 // LocalAccessAllowed it should not be possible to load an iframe over the
 // file: scheme.
-void tst_Origins::mixedSchemes()
+void tst_Origins::mixedSchemes_data()
 {
-    ScopedAttribute sa(m_page->settings(), QWebEngineSettings::ErrorPageEnabled, false);
+    QTest::addColumn<QString>("schemeFrom");
+    QTest::addColumn<QVariantMap>("testPairs");
 
-    QVERIFY(verifyLoad("file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
-                       + "/resources/mixedSchemes.html"));
-    eval("setIFrameUrl('file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
-         + "/resources/mixedSchemes_frame.html')");
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('qrc:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('tst:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-
-    QVERIFY(verifyLoad(QSL("qrc:/resources/mixedSchemes.html")));
-    eval("setIFrameUrl('file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
-         + "/resources/mixedSchemes_frame.html')");
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-    eval(QSL("setIFrameUrl('qrc:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('tst:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+    QVariant SLF = QVariant(QSL("canLoadAndAccess")), OK = QVariant(QSL("canLoadButNotAccess")),
+             ERR = QVariant(QSL("cannotLoad"));
+    std::vector<std::pair<const char *, std::vector<std::pair<const char *, QVariant>>>> data = {
+        { "file",
+          {
+                  { "file", SLF },
+                  { "qrc", OK },
+                  { "tst", ERR },
+          } },
+        { "qrc",
+          {
+                  { "file", ERR },
+                  { "qrc", SLF },
+                  { "tst", OK },
+          } },
+        { "tst",
+          {
+                  { "file", ERR },
+                  { "qrc", OK },
+                  { "tst", SLF },
+          } },
+        { "PathSyntax",
+          {
+                  { "PathSyntax", SLF },
+                  { "PathSyntax-Local", ERR },
+                  { "PathSyntax-LocalAccessAllowed", OK },
+                  { "PathSyntax-NoAccessAllowed", OK },
+          } },
+        { "PathSyntax-LocalAccessAllowed",
+          {
+                  { "PathSyntax", OK },
+                  { "PathSyntax-Local", OK },
+                  { "PathSyntax-LocalAccessAllowed", SLF },
+                  { "PathSyntax-NoAccessAllowed", OK },
+          } },
+        { "PathSyntax-NoAccessAllowed",
+          {
+                  { "PathSyntax", OK },
+                  { "PathSyntax-Local", ERR },
+                  { "PathSyntax-LocalAccessAllowed", OK },
+                  { "PathSyntax-NoAccessAllowed", OK },
+          } },
+        { "HostSyntax://a",
+          {
+                  { "HostSyntax://a", SLF },
+                  { "HostSyntax://b", OK },
+          } },
+        { "local-localaccess",
+          {
+                  { "local-cors", OK },
+                  { "local-localaccess", SLF },
+                  { "local", OK },
+          } },
+        { "local-cors",
+          {
+                  { "local", OK },
+                  { "local-cors", SLF },
+          } },
+    };
 
-    QVERIFY(verifyLoad(QSL("tst:/resources/mixedSchemes.html")));
-    eval("setIFrameUrl('file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
-         + "/resources/mixedSchemes_frame.html')");
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-    eval(QSL("setIFrameUrl('qrc:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('tst:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
+    for (auto &&d : data) {
+        auto schemeFrom = d.first;
+        QVariantMap testPairs;
+        for (auto &&destSchemes : d.second) {
+            auto &&destScheme = destSchemes.first;
+            testPairs[destScheme] = destSchemes.second;
+        }
+        QTest::addRow("%s", schemeFrom) << schemeFrom << testPairs;
+    }
+}
 
-    QVERIFY(verifyLoad(QSL("PathSyntax:/resources/mixedSchemes.html")));
-    eval(QSL("setIFrameUrl('PathSyntax:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-Local:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-    eval(QSL("setIFrameUrl('PathSyntax-LocalAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-NoAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+static QStringList protocolAndHost(const QString scheme)
+{
+    static QString srcDir(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath());
+    QStringList result;
+    if (scheme == QSL("file")) {
+        return QStringList{ scheme, srcDir };
+    }
+    if (scheme.contains(QSL("HostSyntax:"))) {
+        const QStringList &res = scheme.split(':');
+        Q_ASSERT(res.size() == 2);
+        return res;
+    }
+    return QStringList{ scheme, "" };
+}
 
-    QVERIFY(verifyLoad(QSL("PathSyntax-LocalAccessAllowed:/resources/mixedSchemes.html")));
-    eval(QSL("setIFrameUrl('PathSyntax:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-Local:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-LocalAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-NoAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+void tst_Origins::mixedSchemes()
+{
+    QFETCH(QString, schemeFrom);
+    QFETCH(QVariantMap, testPairs);
 
-    QVERIFY(verifyLoad(QSL("PathSyntax-NoAccessAllowed:/resources/mixedSchemes.html")));
-    eval(QSL("setIFrameUrl('PathSyntax:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-Local:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("cannotLoad")));
-    eval(QSL("setIFrameUrl('PathSyntax-LocalAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('PathSyntax-NoAccessAllowed:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+    ScopedAttribute sa(m_page->settings(), QWebEngineSettings::ErrorPageEnabled, false);
+    QString srcDir(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath());
+    QString host;
+    auto pah = protocolAndHost(schemeFrom);
+    auto loadUrl = QString("%1:%2/resources/mixedSchemes.html").arg(pah[0]).arg(pah[1]);
+    QVERIFY(verifyLoad(loadUrl));
 
-    QVERIFY(verifyLoad(QSL("HostSyntax://a/resources/mixedSchemes.html")));
-    eval(QSL("setIFrameUrl('HostSyntax://a/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('HostSyntax://b/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+    QStringList schemesTo, expected, results;
+    for (auto it = testPairs.begin(), end = testPairs.end(); it != end; ++it) {
 
-    QVERIFY(verifyLoad(QSL("local-localaccess:/resources/mixedSchemes.html")));
-    eval("setIFrameUrl('local-cors:/resources/mixedSchemes_frame.html')");
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('local-localaccess:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('local:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+        auto schemeTo = it.key();
+        auto pah = protocolAndHost(schemeTo);
+        auto expectedResult = it.value().toString();
+        auto frameUrl = QString("%1:%2/resources/mixedSchemes_frame.html").arg(pah[0]).arg(pah[1]);
+        auto imgUrl = QString("%1:%2/resources/red.png").arg(pah[0]).arg(pah[1]);
 
-    QVERIFY(verifyLoad(QSL("local-cors:/resources/mixedSchemes.html")));
-    eval("setIFrameUrl('local:/resources/mixedSchemes_frame.html')");
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
-    eval(QSL("setIFrameUrl('local-cors:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadAndAccess")));
-    eval(QSL("setIFrameUrl('local:/resources/mixedSchemes_frame.html')"));
-    QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess")));
+        eval(QString("setIFrameUrl('%1','%2')").arg(frameUrl).arg(imgUrl));
+
+        // wait for token in the log
+        QTRY_VERIFY(m_page->logContainsDoneMarker());
+        const QString result = m_page->findResultInLog();
+        m_page->clearLog();
+        schemesTo.append(schemeTo.rightJustified(20));
+        results.append(result.rightJustified(20));
+        expected.append(expectedResult.rightJustified(20));
+    }
+
+    QVERIFY2(results == expected,
+             qPrintable(QString("\nFrom '%1' to:\n\tScheme: %2\n\tActual: %3\n\tExpect: %4")
+                                .arg(schemeFrom)
+                                .arg(schemesTo.join(' '))
+                                .arg(results.join(' '))
+                                .arg(expected.join(' '))));
 }
 
 // Like mixedSchemes but adds a Content-Security-Policy: frame-src 'none' header.
@@ -1015,7 +1079,7 @@ void tst_Origins::mixedContent()
         return QString("setIFrameUrl('%1','%2')").arg(frameUrl).arg(imgUrl);
     };
 
-    m_page->messages.clear();
+    m_page->clearLog();
     QStringList schemesTo, expected, results;
     for (auto it = testPairs.begin(), end = testPairs.end(); it != end; ++it) {
 
@@ -1025,17 +1089,9 @@ void tst_Origins::mixedContent()
         eval(setIFrameUrl(schemeTo));
 
         // wait for token in the log
-        QTRY_VERIFY(m_page->messages.contains("TEST:done"));
-        QString result;
-        // make sure we do not have some extra logs from blink
-        for (auto message : m_page->messages) {
-            QStringList s = message.split(':');
-            if (s.size() > 1 && s[0] == "TEST") {
-                result = s[1];
-                break;
-            }
-        }
-        m_page->messages.clear();
+        QTRY_VERIFY(m_page->logContainsDoneMarker());
+        const QString result = m_page->findResultInLog();
+        m_page->clearLog();
         schemesTo.append(schemeTo.rightJustified(20));
         results.append(result.rightJustified(20));
         expected.append(expectedResult.rightJustified(20));
-- 
cgit v1.2.3


From 415ee56f9a9be4ffd1b277d96e0527d7fcbbd3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Tue, 13 Dec 2022 01:02:30 +0100
Subject: Recreate response head objects on multiple redirect

The previous response head gets moved when redirecting, which lead to
dereferencing a null pointer on the next redirect.

Fixes: QTBUG-109357
Change-Id: Iaad1c46b8d4ca9720f1749980a9e06337ca0f3d8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit c6b2b5d8038b3ec0de6233c1e21df60ade11c81b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qwebengineurlrequestinterceptor/CMakeLists.txt |  2 +
 .../resources/content3.html                        |  6 +++
 .../tst_qwebengineurlrequestinterceptor.cpp        | 47 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 tests/auto/core/qwebengineurlrequestinterceptor/resources/content3.html

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt b/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt
index 0f8d90a08..e03caa6d7 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt
@@ -12,6 +12,8 @@ qt_internal_add_test(tst_qwebengineurlrequestinterceptor
 
 set(tst_qwebengineurlrequestinterceptor_resource_files
     "resources/content.html"
+    "resources/content2.html"
+    "resources/content3.html"
     "resources/favicon.html"
     "resources/firstparty.html"
     "resources/fontawesome.woff"
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/resources/content3.html b/tests/auto/core/qwebengineurlrequestinterceptor/resources/content3.html
new file mode 100644
index 000000000..84bf55036
--- /dev/null
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/resources/content3.html
@@ -0,0 +1,6 @@
+<html>
+<head><link rel="icon" href="data:,"></head>
+<body>
+<a>Simple test page without favicon (meaning no separate request from http server)</a>
+</body>
+</html>
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 99cf3f244..f79a80641 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -45,6 +45,7 @@ private Q_SLOTS:
     void replaceInterceptor_data();
     void replaceInterceptor();
     void replaceOnIntercept();
+    void multipleRedirects();
 };
 
 tst_QWebEngineUrlRequestInterceptor::tst_QWebEngineUrlRequestInterceptor()
@@ -177,6 +178,29 @@ public:
     }
 };
 
+class TestMultipleRedirectsInterceptor : public QWebEngineUrlRequestInterceptor {
+public:
+    QList<RequestInfo> requestInfos;
+    QMap<QUrl, QUrl> redirectPairs;
+    int redirectCount = 0;
+    void interceptRequest(QWebEngineUrlRequestInfo &info) override
+    {
+        QVERIFY(QThread::currentThread() == QCoreApplication::instance()->thread());
+        qCDebug(lc) << this << "Type:" << info.resourceType() << info.requestMethod() << "Navigation:" << info.navigationType()
+                    << info.requestUrl() << "Initiator:" << info.initiator();
+        auto redirectUrl = redirectPairs.constFind(info.requestUrl());
+        if (redirectUrl != redirectPairs.constEnd()) {
+          info.redirect(redirectUrl.value());
+          requestInfos.append(info);
+          redirectCount++;
+        }
+    }
+
+    TestMultipleRedirectsInterceptor()
+    {
+    }
+};
+
 class ConsolePage : public QWebEnginePage {
     Q_OBJECT
 public:
@@ -850,5 +874,28 @@ void tst_QWebEngineUrlRequestInterceptor::replaceOnIntercept()
     QCOMPARE(profileInterceptor.requestInfos.size(), pageInterceptor2.requestInfos.size());
 }
 
+void tst_QWebEngineUrlRequestInterceptor::multipleRedirects()
+{
+    HttpServer server;
+    server.setResourceDirs({ ":/resources" });
+    QVERIFY(server.start());
+
+    TestMultipleRedirectsInterceptor multiInterceptor;
+    multiInterceptor.redirectPairs.insert(QUrl(server.url("/content.html")), QUrl(server.url("/content2.html")));
+    multiInterceptor.redirectPairs.insert(QUrl(server.url("/content2.html")), QUrl(server.url("/content3.html")));
+
+    QWebEngineProfile profile;
+    profile.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
+    profile.setUrlRequestInterceptor(&multiInterceptor);
+    QWebEnginePage page(&profile);
+    QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
+
+    page.setUrl(server.url("/content.html"));
+
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
+    QTRY_COMPARE(multiInterceptor.redirectCount, 2);
+    QTRY_COMPARE(multiInterceptor.requestInfos.size(), 2);
+}
+
 QTEST_MAIN(tst_QWebEngineUrlRequestInterceptor)
 #include "tst_qwebengineurlrequestinterceptor.moc"
-- 
cgit v1.2.3


From fa48a0d4e3adc464d4e2d61bf4662f515fe95a9e Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 5 Dec 2022 12:36:06 +0100
Subject: Disable nss test on yocto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As pk12util call fails disable the test.

Fixes: QTBUG-109179
Change-Id: I4149c77a86c3c1df8b34ed9b641eae916e688ecc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 6dc341bc52511ade244878a4da35f4de587b528e)
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
index 55908d8e8..7ecc71637 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
+++ b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
@@ -31,7 +31,7 @@ qt_internal_add_resource(tst_qwebengineclientcertificatestore "tst_qwebenginecli
         ${tst_qwebengineclientcertificatestore_resource_files}
 )
 
-if(LINUX)
+if(LINUX AND NOT CMAKE_CROSSCOMPILING)
 
     get_filename_component(homePath $ENV{HOME} ABSOLUTE)
 
-- 
cgit v1.2.3


From 0b326ac057d8277b2e94cb90e9e80207cc174de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Thu, 22 Dec 2022 12:08:12 +0100
Subject: Update Chromium

Submodule src/3rdparty 0a34013e..f2bbd3ec:
  * [Backport] Security bug 1393384
  * [Backport] Security bug 1393177
  * [Backport] Security bug 1394382 (4/4)
  * [Backport] Security bug 1394382 (3/4)
  * [Backport] Security bug 1394382 (2/4)
  * [Backport] Security bug 1394382 (1/4)
  * [Backport] CVE-2022-4440: Use after free in Profiles
  * [Backport] CVE-2022-4439: Use after free in Aura
  * [Backport] CVE-2022-4438: Use after free in Blink Frames
  * [Backport] CVE-2022-4436: Use after free in Blink Media
  * [Backport] CVE-2022-4437: Use after free in Mojo IPC
  * [Backport] Security bug 1367993
  * [Backport] Security bug 1365082
  * [Backport] Security bug 1378601
  * [Backport] CVE-2022-4194: Use after free in Accessibility
  * [Backport] CVE-2022-4193: Insufficient policy enforcement in File System API
  * [Backport] CVE-2022-4190: Insufficient data validation in Directory
  * [Backport] Security bug 1372019 (4/4)
  * [Backport] Security bug 1372019 (3/4)
  * [Backport] Security bug 1372019 (2/4)
  * [Backport] Security bug 1372019 (1/4)

Adjusts the test for the file chooser as Chromium now enforces folder uploads to be folders.

Task-number: QTBUG-109224
Fixes: QTBUG-108106
Change-Id: Ib1ccc839650ae323d6ba867991eca19d5bb858aa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index cbb63289f..bfa97ea79 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -4822,6 +4822,10 @@ public:
         Q_UNUSED(oldFiles);
         chosenFileSelectionMode = mode;
         chosenAcceptedMimeTypes = acceptedMimeTypes;
+
+        if (chosenFileSelectionMode == QWebEnginePage::FileSelectUploadFolder)
+          return QStringList() << m_tempDir.path();
+
         return QStringList() << (m_tempDir.path() + "/file.txt");
     }
 
-- 
cgit v1.2.3


From 8cc8e98c64f7fdea58593b4d1344bef2686c5ed1 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 5 Dec 2022 15:36:43 +0100
Subject: Fix creation of nssdb for certificate store unit test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In case there is no nssdb in system create empty database.
This got unnoticed as running webengine creates one, however when
doing test configuration on fresh system without one pk12utils fails.

Move 'nickname' to certificate otherwise clean job does not work.

Task-number: QTBUG-109179
Change-Id: I401ffab62dd13d7aa1459672b1170afcde3cde83
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit b3b4aef1d67096632c703adca6fdfb2b676bdc0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../qwebengineclientcertificatestore/CMakeLists.txt |  20 +++++++++++++-------
 .../resources/client2.p12                           | Bin 2549 -> 2710 bytes
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
index 7ecc71637..ee5473348 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
+++ b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
@@ -36,35 +36,41 @@ if(LINUX AND NOT CMAKE_CROSSCOMPILING)
     get_filename_component(homePath $ENV{HOME} ABSOLUTE)
 
     find_program(pk12util_EXECUTABLE NAMES pk12util)
+    find_program(certutil_EXECUTABLE NAMES certutil)
 
-    if(pk12util_EXECUTABLE)
+    if(pk12util_EXECUTABLE AND certutil_EXECUTABLE)
         add_custom_command(
             DEPENDS resources/client2.p12
-            COMMAND ${pk12util_EXECUTABLE}
-                -d sql:"${homePath}/.pki/nssdb"
-                -n qwebengineclientcertificatestore
+            COMMAND test -e "${homePath}/.pki/nssdb" || ${CMAKE_COMMAND} -E make_directory
+                "${homePath}/.pki/nssdb"
+            COMMAND test -e "${homePath}/.pki/nssdb/cert9.db" || ${certutil_EXECUTABLE}
+                -N --empty-password -d sql:${homePath}/.pki/nssdb
+            COMMAND test -e "${homePath}/.pki/nssdb/cert9.db" && ${pk12util_EXECUTABLE}
+                -d sql:${homePath}/.pki/nssdb
                 -i "${CMAKE_CURRENT_LIST_DIR}/resources/client2.p12"
-                -W \"\"
+                -W ""
             COMMAND ${CMAKE_COMMAND} -E touch pk12util.stamp
             OUTPUT pk12util.stamp
+            VERBATIM
+            USES_TERMINAL
         )
         add_custom_target(
             add-user-personal-certificate
             DEPENDS pk12util.stamp
     )
     qt_internal_extend_target(tst_qwebengineclientcertificatestore DEFINES TEST_NSS)
-    add_dependencies(tst_qwebengineclientcertificatestore  add-user-personal-certificate)
+    add_dependencies(tst_qwebengineclientcertificatestore add-user-personal-certificate)
     endif()
 
     find_program(certutil_EXECUTABLE NAMES certutil)
 
     if(certutil_EXECUTABLE)
         add_custom_target(remove-user-personal-certificate
+            COMMAND ${CMAKE_COMMAND} -E remove pk12util.stamp
             COMMAND ${certutil_EXECUTABLE}
                 -d sql:"${homePath}/.pki/nssdb"
                 -D
                 -n qwebengineclientcertificatestore
-            COMMAND ${CMAKE_COMMAND} -E remove pk12util.stamp
         )
     endif()
 endif()
diff --git a/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12 b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12
index feccd77e1..81e7eb624 100644
Binary files a/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12 and b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12 differ
-- 
cgit v1.2.3


From b026fc355e67a6d678ff8631c8d8132aff29281d Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Tue, 20 Dec 2022 16:12:22 +0100
Subject: Quick: Fix file selection modes in the default UI delegate

Our implementation of QML file picker was outdated. Now directory picker
is a separate type of dialog and other file selection modes are set in
FileDialog.fileMode property.

Change-Id: Icc62369539c56666e596e5ee6f1b3068a43acd81
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 35d4b0b1d1c723e32d589b3dfddfe96eaa8e5568)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/qmltests/data/tst_filePicker.qml      |  2 +-
 .../QtWebEngine/ControlsDelegates/DirectoryPicker.qml  | 18 ++++++++++++++++++
 .../mock-delegates/TestParams/FilePickerParams.qml     |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index 2404efd2d..a557369ed 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
@@ -146,7 +146,7 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("../data"))
 
             keyClick(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(FilePickerParams, "directoryPickerOpened", true)
             // Check that the title is a file list (eg. "test1.html,test2.html")
             tryVerify(function() { return webEngineView.title.match("^([^,]+,)+[^,]+$"); })
 
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml
new file mode 100644
index 000000000..71da28843
--- /dev/null
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml
@@ -0,0 +1,18 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import "../../TestParams"
+
+QtObject {
+    signal folderSelected(var folder)
+    signal rejected()
+
+    function open() {
+        FilePickerParams.directoryPickerOpened = true;
+        if (FilePickerParams.selectFiles)
+            folderSelected(FilePickerParams.selectedFilesUrl);
+        else
+            rejected();
+    }
+}
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
index 4a1ffeb02..67d67dc40 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
@@ -8,5 +8,6 @@ QtObject {
     property var selectedFilesUrl: [];
     property bool selectFiles: false;
     property bool filePickerOpened: false;
+    property bool directoryPickerOpened: false;
     property var nameFilters: [];
 }
-- 
cgit v1.2.3


From 976e0ead467c2c99005727701473dd46c13920ff Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Wed, 1 Feb 2023 09:39:14 +0100
Subject: Replace uses of deprecated _qs with _s

Task-number: QTBUG-101408
Change-Id: Ie8a7944c3ded5662953bed00f022905f5805275e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit b4cf9c2e0520ec39ef064955ec025f5941e4c04a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/pdfquick/multipageview/tst_multipageview.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
index 48cec928f..764a69959 100644
--- a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
+++ b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
@@ -12,6 +12,8 @@
 #include <QtPdfQuick/private/qquickpdfpageimage_p.h>
 #include "../shared/util.h"
 
+using namespace Qt::StringLiterals;
+
 Q_LOGGING_CATEGORY(lcTests, "qt.pdf.tests")
 
 class tst_MultiPageView : public QQuickDataTest
@@ -257,7 +259,7 @@ void tst_MultiPageView::password()
     // actual QPdfDocument::pageCountChanged(int), for comparison with the illusory QQuickPdfDocument::pageCountChanged
     QVERIFY(extPageCountChangedSpy.isValid());
 
-    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
+    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_s));
 
     QTRY_COMPARE(passwordRequiredSpy.size(), 1);
     qCDebug(lcTests) << "error while awaiting password" << doc->error()
@@ -268,7 +270,7 @@ void tst_MultiPageView::password()
     QCOMPARE(extPageCountChangedSpy.size(), 0);
     QCOMPARE(statusChangedSpy.size(), 2); // Loading and then Error
     statusChangedSpy.clear();
-    QVERIFY(doc->setProperty("password", u"Qt"_qs));
+    QVERIFY(doc->setProperty("password", u"Qt"_s));
     QCOMPARE(passwordChangedSpy.size(), 1);
     QTRY_COMPARE(doc->property("status").toInt(), int(QPdfDocument::Status::Ready));
     qCDebug(lcTests) << "after setPassword" << doc->error()
@@ -288,8 +290,8 @@ void tst_MultiPageView::selectionAndClipboard()
     QVERIFY(pdfView);
     QQuickPdfDocument *doc = pdfView->property("document").value<QQuickPdfDocument*>();
     QVERIFY(doc);
-    QVERIFY(doc->setProperty("password", u"Qt"_qs));
-    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
+    QVERIFY(doc->setProperty("password", u"Qt"_s));
+    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_s));
     QTRY_COMPARE(pdfView->property("currentPageRenderingStatus").toInt(), QQuickPdfPageImage::Ready);
 
     QVERIFY(QMetaObject::invokeMethod(pdfView, "selectAll"));
@@ -316,8 +318,8 @@ void tst_MultiPageView::search()
     QTRY_COMPARE(pdfView->width(), 200);
     QQuickPdfDocument *doc = pdfView->property("document").value<QQuickPdfDocument*>();
     QVERIFY(doc);
-    QVERIFY(doc->setProperty("password", u"Qt"_qs));
-    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_qs));
+    QVERIFY(doc->setProperty("password", u"Qt"_s));
+    QVERIFY(pdfView->setProperty("source", u"pdf-sample.protected.pdf"_s));
     QTRY_COMPARE(pdfView->property("currentPageRenderingStatus").toInt(), QQuickPdfPageImage::Ready);
     QPdfSearchModel *searchModel = pdfView->property("searchModel").value<QPdfSearchModel*>();
     QVERIFY(searchModel);
@@ -328,7 +330,7 @@ void tst_MultiPageView::search()
     QObject *multiline = findFirstChild(firstPage, "QQuickPathMultiline");
     QVERIFY(multiline);
 
-    pdfView->setProperty("searchString", u"PDF"_qs);
+    pdfView->setProperty("searchString", u"PDF"_s);
     QTRY_COMPARE(searchModel->rowCount(QModelIndex()), 7); // occurrences of the word "PDF" in this file
     const int count = searchModel->rowCount(QModelIndex());
     QList<QList<QPointF>> resultOutlines = multiline->property("paths").value<QList<QList<QPointF>>>();
-- 
cgit v1.2.3


From a5d3d83a2ffb13d2076c3a81e6d47e93ff65edef Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 16 Jan 2023 12:23:59 +0100
Subject: Add qml filesystem api tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are three functions we use within file systems API, which
trigger dialogs:

  * window.showSaveFilePicker
  * window.showOpenFilePicker
  * window.showDirectoryPicker

Only first one was tested with widgets, therefore add tests which cover
use of api, and also test cover the found issues in previous commits.

Note we have separate test to cover file system dialogs coming from
<input> html tags in tst_filePicker

Change-Id: I4616efa84688ed471fb8c4566e49262bce945638
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 1a291c5579122e520af1a2cec263ebd12dcd2407)
---
 tests/auto/quick/qmltests/CMakeLists.txt          |   1 +
 tests/auto/quick/qmltests/data/filesystemapi.html |  66 ++++++++++++
 tests/auto/quick/qmltests/data/tst_filesystem.qml | 124 ++++++++++++++++++++++
 tests/auto/quick/qmltests/tst_qmltests.cpp        |   9 ++
 4 files changed, 200 insertions(+)
 create mode 100644 tests/auto/quick/qmltests/data/filesystemapi.html
 create mode 100644 tests/auto/quick/qmltests/data/tst_filesystem.qml

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt
index 53c8ed231..c7ebe8b11 100644
--- a/tests/auto/quick/qmltests/CMakeLists.txt
+++ b/tests/auto/quick/qmltests/CMakeLists.txt
@@ -25,6 +25,7 @@ set(testList
     tst_favicon.qml
     tst_faviconDatabase.qml
     tst_filePicker.qml
+    tst_filesystem.qml
     tst_findText.qml
     tst_focusOnNavigation.qml
     tst_fullScreenRequest.qml
diff --git a/tests/auto/quick/qmltests/data/filesystemapi.html b/tests/auto/quick/qmltests/data/filesystemapi.html
new file mode 100644
index 000000000..ab1a33e4d
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/filesystemapi.html
@@ -0,0 +1,66 @@
+<html>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title> Failed to Upload </title>
+</script>
+</head>
+
+<body>
+<button>Request File Picker</button>
+<script>
+ async function handleDirectoryEntry( dirHandle, out ) {
+     for await (const entry of dirHandle.values()) {
+         if (entry.kind === "file"){
+             const file = await entry.getFile();
+             out[ file.name ] = file;
+         }
+         if (entry.kind === "directory") {
+             const newHandle = await dirHandle.getDirectoryHandle( entry.name, { create: false } );
+             const newOut = out[ entry.name ] = {};
+             await handleDirectoryEntry( newHandle, newOut );
+         }
+     }
+ }
+    const button = document.querySelector('button');
+    button.addEventListener('click', async function() {
+    switch(window.dialogType) {
+        case "savePicker":
+           const saveFileHandle = await window.showSaveFilePicker();
+           const writable = await saveFileHandle.createWritable();
+           await writable.write(new Blob(['TEST_CONTENT']));
+           await writable.close();
+           console.log("TEST:DONE")
+           break;
+       case "filePicker":
+            let [openFileHandle] = await window.showOpenFilePicker();
+            const options = {};
+            options.mode = 'readwrite'
+            await openFileHandle.requestPermission(options)
+            const file = await openFileHandle.getFile();
+            const contents = await file.text();
+            console.log("TEST:" + contents)
+            console.log("TEST:DONE")
+            break;
+       case "directoryPicker":
+            console.log("start")
+            const dirHandle = await window.showDirectoryPicker();
+            for await (const entry of dirHandle.values()) {
+                if (entry.kind === "file"){
+                    continue
+                }
+                if (entry.kind === "directory") {
+                    console.log("TEST:" + entry.name)
+                }
+            }
+            console.log("TEST:DONE")
+            break;
+       default:
+    }
+    });
+    window.onload = function() {
+    window.dialogType = window.location.href.split('=')[1];
+    document.querySelector('button').focus()
+    }
+</script>
+</body>
+</html>
diff --git a/tests/auto/quick/qmltests/data/tst_filesystem.qml b/tests/auto/quick/qmltests/data/tst_filesystem.qml
new file mode 100644
index 000000000..fa0da4457
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_filesystem.qml
@@ -0,0 +1,124 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import QtTest
+import QtWebEngine
+import Test.util
+import "../../qmltests/data"
+import "../mock-delegates/TestParams"
+
+
+TestWebEngineView {
+    id: webEngineView
+    width: 400
+    height: 300
+    property var logs: []
+    property bool accessRequested: false
+    property url file: tempDir.pathUrl('file.txt')
+
+    onJavaScriptConsoleMessage: function(level, message, lineNumber, source) {
+        var pair = message.split(':');
+        if (pair.length == 2 && pair[0] == "TEST")
+            logs.push(pair[1]);
+    }
+
+    TempDir { id: tempDir }
+
+    TestCase {
+        id: testCase
+        name: "FileSystemAPI"
+        when: windowShown
+
+        function init() {
+            clearLog()
+            FilePickerParams.filePickerOpened = false
+            FilePickerParams.selectFiles = false
+            FilePickerParams.selectedFilesUrl = []
+            FilePickerParams.nameFilters = []
+            accessRequested = false;
+        }
+
+        function cleanup() {
+            clearLog()
+        }
+
+        function clearLog() {
+            logs = []
+        }
+
+        function logContainsDoneMarker() {
+            if (logs.indexOf("DONE") > -1)
+                return true
+            else
+                return false
+        }
+
+        function result() {
+            return logs[0]
+        }
+
+        function fileAccessRequest(request) {
+            testCase.verify(!accessRequested)
+            accessRequested = true
+            testCase.verify(request.filePath == file)
+            testCase.verify(request.accessFlags == WebEngineFileSystemAccessRequest.Write | WebEngineFileSystemAccessRequest.Read)
+            request.accept()
+        }
+
+        function directoryAccessRequest(request) {
+            testCase.verify(!accessRequested)
+            accessRequested = true
+            testCase.verify(request.filePath == tempDir.pathUrl())
+            testCase.verify(request.accessFlags == WebEngineFileSystemAccessRequest.Read)
+            request.accept()
+        }
+
+        function test_saveFile() {
+            webEngineView.fileSystemAccessRequested.connect(fileAccessRequest);
+            webEngineView.url = Qt.resolvedUrl("filesystemapi.html?dialog=savePicker");
+            verify(webEngineView.waitForLoadSucceeded());
+            FilePickerParams.selectFiles = true;
+            FilePickerParams.selectedFilesUrl.push(file);
+            keyClick(Qt.Key_Enter); // Open SaveDialog.
+            tryCompare(FilePickerParams, "filePickerOpened", true);
+            tryVerify(logContainsDoneMarker,2000)
+            // write access for save dialogs is automatically granted
+            verify(!accessRequested)
+            webEngineView.fileSystemAccessRequested.disconnect(fileAccessRequest);
+        }
+
+        function test_openFile() {
+            // first save the file before open
+            test_saveFile()
+            init()
+            webEngineView.fileSystemAccessRequested.connect(fileAccessRequest);
+            webEngineView.url = Qt.resolvedUrl("filesystemapi.html?dialog=filePicker");
+            verify(webEngineView.waitForLoadSucceeded());
+            FilePickerParams.selectFiles = true;
+            FilePickerParams.selectedFilesUrl.push(file);
+            keyClick(Qt.Key_Enter); // Open FileDialog.
+            tryCompare(FilePickerParams, "filePickerOpened", true);
+            tryVerify(logContainsDoneMarker,2000)
+            verify(logs.indexOf("TEST_CONTENT") > -1)
+            verify(accessRequested)
+            webEngineView.fileSystemAccessRequested.disconnect(fileAccessRequest);
+        }
+
+        function test_selectDirectory() {
+            tempDir.createDirectory("TEST_DIR")
+            webEngineView.fileSystemAccessRequested.connect(directoryAccessRequest);
+            webEngineView.url = Qt.resolvedUrl("filesystemapi.html?dialog=directoryPicker");
+            verify(webEngineView.waitForLoadSucceeded())
+            FilePickerParams.selectFiles = true;
+            FilePickerParams.selectedFilesUrl.push(tempDir.pathUrl());
+            keyClick(Qt.Key_Enter); // Open showDirectoryDialog.
+            tryCompare(FilePickerParams, "directoryPickerOpened", true);
+            tryVerify(logContainsDoneMarker,2000)
+            verify(logs.indexOf("TEST_DIR") > -1)
+            verify(accessRequested)
+            webEngineView.fileSystemAccessRequested.disconnect(directoryAccessRequest);
+        }
+
+    }
+}
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 0d9e12cd6..9e928157e 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -105,6 +105,13 @@ public:
         return tempDir.isValid() ? tempDir.path() : QString();
     }
 
+    Q_INVOKABLE QUrl pathUrl(const QString &filename = QString())
+    {
+        Q_ASSERT(tempDir.isValid());
+        return filename.isEmpty() ? QUrl::fromLocalFile(tempDir.path())
+                                  : QUrl::fromLocalFile(tempDir.filePath(filename));
+    }
+
     Q_INVOKABLE void removeRecursive(const QString dirname)
     {
         QDir dir(dirname);
@@ -118,6 +125,8 @@ public:
         QDir().rmdir(dirname);
     }
 
+    Q_INVOKABLE void createDirectory(const QString dirname) { QDir(tempDir.path()).mkdir(dirname); }
+
 private:
     QTemporaryDir tempDir;
 };
-- 
cgit v1.2.3


From 47c398a510d13b1bbe41a665141f9eea52ffac32 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Fri, 24 Feb 2023 14:57:52 +0100
Subject: Fix initialization of QWebEngineDownloadRequest::totalBytes for
 Widgets

QQuickWebEngineProfile already initializes totalBytes.

Also clean up QWebEngineDownloadRequestPrivate and fix typo in
documentation.

Fixes: QTBUG-104869
Change-Id: I8c4b79c076ddc63180960e22a9488b45ff6c4402
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 496647f7647571ca3cdf81b10ba418de0f06f34d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 01be7f108c0d501f532b197f091baaaaba211ee6)
---
 .../qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
index 1c2268b31..c81a27b3a 100644
--- a/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
+++ b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
@@ -415,7 +415,7 @@ void tst_QWebEngineDownloadRequest::downloadLink()
     ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         QCOMPARE(item->isFinished(), false);
-        QCOMPARE(item->totalBytes(), -1);
+        QCOMPARE(item->totalBytes(), fileContents.size());
         QCOMPARE(item->receivedBytes(), 0);
         QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
         QCOMPARE(item->isSavePageDownload(), false);
@@ -526,7 +526,7 @@ void tst_QWebEngineDownloadRequest::downloadTwoLinks()
     ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         QCOMPARE(item->isFinished(), false);
-        QCOMPARE(item->totalBytes(), -1);
+        QCOMPARE(item->totalBytes(), 5); // strlen("fileN")
         QCOMPARE(item->receivedBytes(), 0);
         QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
         QCOMPARE(item->savePageFormat(), QWebEngineDownloadRequest::UnknownSaveFormat);
-- 
cgit v1.2.3


From abd2b84ec2b5e6c8f824baeb706bb9de0043cdf5 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 24 Feb 2023 13:08:21 +0100
Subject: Fix not working password test for QPdfQuick

In qml url can have different schemas like 'qrc'
'file' 'assets'. Make correct conversion so
file can be loaded.

Note check isLocalFile() is not true for qrc scheme.

Fixes: QTBUG-106072
Change-Id: I4dcc969e4c6d9b3f58ea5d81d20d8e81b55edfde
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit efbb12954cf6e581b6b29bed2fa2bb26e1cfab71)
---
 tests/auto/pdfquick/multipageview/BLACKLIST | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 tests/auto/pdfquick/multipageview/BLACKLIST

(limited to 'tests')

diff --git a/tests/auto/pdfquick/multipageview/BLACKLIST b/tests/auto/pdfquick/multipageview/BLACKLIST
deleted file mode 100644
index b608bef1c..000000000
--- a/tests/auto/pdfquick/multipageview/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-# QTBUG-106072
-[password]
-windows
-- 
cgit v1.2.3


From 9fd30150ba979e0a79ad0b9b48261a9f699735bc Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 15 Mar 2023 18:08:56 +0100
Subject: Revert "Use QSslServer in certificate test"

New ssl server can not be used with 6.2, however httpserver is used
by most of the tests, therfore revert the change.

This reverts commit 54017760b77fb8359d4ef51c82668acbfd4e86e2.

Change-Id: If426a78d92c9b8379cea310ada1104b7bfbc7dfd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../core/certificateerror/tst_certificateerror.cpp |  1 -
 tests/auto/httpserver/httpserver.cpp               |  3 +-
 tests/auto/httpserver/httpsserver.h                | 71 ++++++++++------------
 3 files changed, 34 insertions(+), 41 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 67e2d8ae4..fd22f5d63 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -105,7 +105,6 @@ void tst_CertificateError::handleError()
     QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.size(), 1, 30000);
     QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate);
     QCOMPARE(toPlainTextSync(&page), expectedContent);
-    QVERIFY(server.stop());
 }
 
 void tst_CertificateError::fatalError()
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index e08af77e7..c65d68ce7 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -24,8 +24,7 @@ HttpServer::HttpServer(QTcpServer *tcpServer, const QString &protocol,
 {
     m_url.setHost(hostAddress.toString());
     m_url.setScheme(protocol);
-    connect(tcpServer, &QTcpServer::pendingConnectionAvailable, this,
-            &HttpServer::handleNewConnection);
+    connect(tcpServer, &QTcpServer::newConnection, this, &HttpServer::handleNewConnection);
 }
 
 HttpServer::~HttpServer()
diff --git a/tests/auto/httpserver/httpsserver.h b/tests/auto/httpserver/httpsserver.h
index 10deeb322..d064c1416 100644
--- a/tests/auto/httpserver/httpsserver.h
+++ b/tests/auto/httpserver/httpsserver.h
@@ -7,56 +7,51 @@
 #include "httpserver.h"
 
 #include <QDebug>
-#include <QtCore/qfile.h>
-#include <QtNetwork/qsslkey.h>
-#include <QtNetwork/qsslsocket.h>
-#include <QtNetwork/qsslconfiguration.h>
-#include <QtNetwork/qsslserver.h>
+#include <QFile>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QSslConfiguration>
+#include <QTcpServer>
 
-static QSslServer *createServer(const QString &certificateFileName, const QString &keyFileName,
-                                const QString &ca)
+struct SslTcpServer : QTcpServer
 {
-    QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
+    SslTcpServer(const QString &certPath, const QString &keyPath) {
+        sslconf.setLocalCertificateChain(QSslCertificate::fromPath(certPath));
+        sslconf.setPrivateKey(readKey(keyPath));
+    }
+
+    void incomingConnection(qintptr d) override {
+        auto socket = new QSslSocket(this);
+        socket->setSslConfiguration(sslconf);
 
-    QFile keyFile(keyFileName);
-    if (keyFile.open(QIODevice::ReadOnly)) {
-        QSslKey key(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
-        if (!key.isNull()) {
-            configuration.setPrivateKey(key);
-        } else {
-            qCritical() << "Could not parse key: " << keyFileName;
+        if (!socket->setSocketDescriptor(d)) {
+            qWarning() << "Failed to setup ssl socket!";
+            delete socket;
+            return;
         }
-    } else {
-        qCritical() << "Could not find key: " << keyFileName;
-    }
 
-    QList<QSslCertificate> localCerts = QSslCertificate::fromPath(certificateFileName);
-    if (!localCerts.isEmpty()) {
-        configuration.setLocalCertificateChain(localCerts);
-    } else {
-        qCritical() << "Could not find certificate: " << certificateFileName;
+        connect(socket, QOverload<QSslSocket::SocketError>::of(&QSslSocket::errorOccurred),
+                [] (QSslSocket::SocketError e) { qWarning() << "! Socket Error:" << e; });
+        connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors),
+                [] (const QList<QSslError> &le) { qWarning() << "! SSL Errors:\n" << le; });
+
+        addPendingConnection(socket);
+        socket->startServerEncryption();
     }
 
-    if (!ca.isEmpty()) {
-        QList<QSslCertificate> caCerts = QSslCertificate::fromPath(ca);
-        if (!caCerts.isEmpty()) {
-            configuration.addCaCertificates(caCerts);
-            configuration.setPeerVerifyMode(QSslSocket::VerifyPeer);
-        } else {
-            qCritical() << "Could not find certificate: " << certificateFileName;
-        }
+    QSslKey readKey(const QString &path) const {
+        QFile file(path);
+        file.open(QIODevice::ReadOnly);
+        return QSslKey(file.readAll(), QSsl::Rsa, QSsl::Pem);
     }
 
-    QSslServer *server = new QSslServer();
-    server->setSslConfiguration(configuration);
-    return server;
-}
+    QSslConfiguration sslconf;
+};
 
 struct HttpsServer : HttpServer
 {
-    HttpsServer(const QString &certPath, const QString &keyPath, const QString &ca,
-                QObject *parent = nullptr)
-        : HttpServer(createServer(certPath, keyPath, ca), "https", QHostAddress::LocalHost, 0,
+    HttpsServer(const QString &certPath, const QString &keyPath, QObject *parent = nullptr)
+        : HttpServer(new SslTcpServer(certPath, keyPath), "https", QHostAddress::LocalHost, 0,
                      parent)
     {
     }
-- 
cgit v1.2.3


From 426349bc1e3f863167753023dd6d65ae3a2404d6 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 15 Mar 2023 20:34:10 +0100
Subject: Fix compilation issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not use QSslServer as it was introduced in 6.4.

Change-Id: I628cc891af1f5eea653595b2d8d6314e372c6033
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 tests/auto/core/CMakeLists.txt             | 2 +-
 tests/auto/quick/qmltests/tst_qmltests.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/CMakeLists.txt b/tests/auto/core/CMakeLists.txt
index ecb3b2cf9..619c0358b 100644
--- a/tests/auto/core/CMakeLists.txt
+++ b/tests/auto/core/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(qwebengineurlrequestinterceptor)
 add_subdirectory(origins)
 add_subdirectory(devtools)
 
-if(QT_FEATURE_ssl)
+if(QT_FEATURE_ssl AND QT_VERSION VERSION_GREATER_EQUAL "6.4")
     add_subdirectory(qwebengineclientcertificatestore)
     add_subdirectory(certificateerror)
 endif()
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 9e928157e..d27ef269d 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
 #if QT_CONFIG(ssl)
     qmlRegisterSingletonType<HttpsServer>(
             "Test.Shared", 1, 0, "HttpsServer", [&](QQmlEngine *, QJSEngine *) {
-                return new HttpsServer(":/resources/server.pem", ":/resources/server.key", "");
+                return new HttpsServer(":/resources/server.pem", ":/resources/server.key");
             });
 #endif
     Setup setup;
-- 
cgit v1.2.3


From 6ed5e15267e2ecc77b03536136d4b637daa254df Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 15 Mar 2023 18:08:56 +0100
Subject: Reapply "Revert "Use QSslServer in certificate test""

New ssl server can not be used with 6.2, however httpserver is used
by most of the tests, therfore revert the change.

This reverts commit 54017760b77fb8359d4ef51c82668acbfd4e86e2.

Change-Id: If426a78d92c9b8379cea310ada1104b7bfbc7dfd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 .../core/certificateerror/tst_certificateerror.cpp |  1 -
 tests/auto/httpserver/httpserver.cpp               |  3 +-
 tests/auto/httpserver/httpsserver.h                | 71 ++++++++++------------
 3 files changed, 34 insertions(+), 41 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 67e2d8ae4..fd22f5d63 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -105,7 +105,6 @@ void tst_CertificateError::handleError()
     QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.size(), 1, 30000);
     QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate);
     QCOMPARE(toPlainTextSync(&page), expectedContent);
-    QVERIFY(server.stop());
 }
 
 void tst_CertificateError::fatalError()
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index e08af77e7..c65d68ce7 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -24,8 +24,7 @@ HttpServer::HttpServer(QTcpServer *tcpServer, const QString &protocol,
 {
     m_url.setHost(hostAddress.toString());
     m_url.setScheme(protocol);
-    connect(tcpServer, &QTcpServer::pendingConnectionAvailable, this,
-            &HttpServer::handleNewConnection);
+    connect(tcpServer, &QTcpServer::newConnection, this, &HttpServer::handleNewConnection);
 }
 
 HttpServer::~HttpServer()
diff --git a/tests/auto/httpserver/httpsserver.h b/tests/auto/httpserver/httpsserver.h
index 10deeb322..d064c1416 100644
--- a/tests/auto/httpserver/httpsserver.h
+++ b/tests/auto/httpserver/httpsserver.h
@@ -7,56 +7,51 @@
 #include "httpserver.h"
 
 #include <QDebug>
-#include <QtCore/qfile.h>
-#include <QtNetwork/qsslkey.h>
-#include <QtNetwork/qsslsocket.h>
-#include <QtNetwork/qsslconfiguration.h>
-#include <QtNetwork/qsslserver.h>
+#include <QFile>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QSslConfiguration>
+#include <QTcpServer>
 
-static QSslServer *createServer(const QString &certificateFileName, const QString &keyFileName,
-                                const QString &ca)
+struct SslTcpServer : QTcpServer
 {
-    QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
+    SslTcpServer(const QString &certPath, const QString &keyPath) {
+        sslconf.setLocalCertificateChain(QSslCertificate::fromPath(certPath));
+        sslconf.setPrivateKey(readKey(keyPath));
+    }
+
+    void incomingConnection(qintptr d) override {
+        auto socket = new QSslSocket(this);
+        socket->setSslConfiguration(sslconf);
 
-    QFile keyFile(keyFileName);
-    if (keyFile.open(QIODevice::ReadOnly)) {
-        QSslKey key(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
-        if (!key.isNull()) {
-            configuration.setPrivateKey(key);
-        } else {
-            qCritical() << "Could not parse key: " << keyFileName;
+        if (!socket->setSocketDescriptor(d)) {
+            qWarning() << "Failed to setup ssl socket!";
+            delete socket;
+            return;
         }
-    } else {
-        qCritical() << "Could not find key: " << keyFileName;
-    }
 
-    QList<QSslCertificate> localCerts = QSslCertificate::fromPath(certificateFileName);
-    if (!localCerts.isEmpty()) {
-        configuration.setLocalCertificateChain(localCerts);
-    } else {
-        qCritical() << "Could not find certificate: " << certificateFileName;
+        connect(socket, QOverload<QSslSocket::SocketError>::of(&QSslSocket::errorOccurred),
+                [] (QSslSocket::SocketError e) { qWarning() << "! Socket Error:" << e; });
+        connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors),
+                [] (const QList<QSslError> &le) { qWarning() << "! SSL Errors:\n" << le; });
+
+        addPendingConnection(socket);
+        socket->startServerEncryption();
     }
 
-    if (!ca.isEmpty()) {
-        QList<QSslCertificate> caCerts = QSslCertificate::fromPath(ca);
-        if (!caCerts.isEmpty()) {
-            configuration.addCaCertificates(caCerts);
-            configuration.setPeerVerifyMode(QSslSocket::VerifyPeer);
-        } else {
-            qCritical() << "Could not find certificate: " << certificateFileName;
-        }
+    QSslKey readKey(const QString &path) const {
+        QFile file(path);
+        file.open(QIODevice::ReadOnly);
+        return QSslKey(file.readAll(), QSsl::Rsa, QSsl::Pem);
     }
 
-    QSslServer *server = new QSslServer();
-    server->setSslConfiguration(configuration);
-    return server;
-}
+    QSslConfiguration sslconf;
+};
 
 struct HttpsServer : HttpServer
 {
-    HttpsServer(const QString &certPath, const QString &keyPath, const QString &ca,
-                QObject *parent = nullptr)
-        : HttpServer(createServer(certPath, keyPath, ca), "https", QHostAddress::LocalHost, 0,
+    HttpsServer(const QString &certPath, const QString &keyPath, QObject *parent = nullptr)
+        : HttpServer(new SslTcpServer(certPath, keyPath), "https", QHostAddress::LocalHost, 0,
                      parent)
     {
     }
-- 
cgit v1.2.3


From f43228468a8ac91ed26d6117c3bfb01b837dc64e Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 15 Mar 2023 20:34:10 +0100
Subject: Reapply 'Fix compilation issues'

Do not use QSslServer as it was introduced in 6.4.

Change-Id: I628cc891af1f5eea653595b2d8d6314e372c6033
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/quick/qmltests/tst_qmltests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 9e928157e..d27ef269d 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
 #if QT_CONFIG(ssl)
     qmlRegisterSingletonType<HttpsServer>(
             "Test.Shared", 1, 0, "HttpsServer", [&](QQmlEngine *, QJSEngine *) {
-                return new HttpsServer(":/resources/server.pem", ":/resources/server.key", "");
+                return new HttpsServer(":/resources/server.pem", ":/resources/server.key");
             });
 #endif
     Setup setup;
-- 
cgit v1.2.3


From 2ae6cb2a03fefe5084df76cc9786d366abd48d82 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 8 Jun 2023 13:03:02 +0200
Subject: Revert "Touchbrowser: port QMutableEventPoint::from() to static
 setters"

Revert the change to compile with 6.2.

This reverts commit 0f2103ef375c6fbae65b53877055951a03000a4a.

Change-Id: Ia66f2713bf58fcbbb631f86b04065814b4ed24c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../quick/touchbrowser/touchmockingapplication.cpp | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'tests')

diff --git a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
index 4fad86d33..2a17757dc 100644
--- a/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
+++ b/tests/manual/quick/touchbrowser/touchmockingapplication.cpp
@@ -66,10 +66,10 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
     if (event->type() == QEvent::KeyRelease && static_cast<QKeyEvent*>(event)->key() == Qt::Key_Control) {
         foreach (int id, m_heldTouchPoints)
             if (m_touchPoints.contains(id) && !QGuiApplication::mouseButtons().testFlag(Qt::MouseButton(id))) {
-                QMutableEventPoint::setState(m_touchPoints[id], QEventPoint::Released);
+                QMutableEventPoint::from(m_touchPoints[id]).setState(QEventPoint::Released);
                 m_heldTouchPoints.remove(id);
             } else
-                QMutableEventPoint::setState(m_touchPoints[id], QEventPoint::Stationary);
+                QMutableEventPoint::from(m_touchPoints[id]).setState(QEventPoint::Stationary);
 
         sendTouchEvent(window, m_heldTouchPoints.isEmpty() ? QEvent::TouchEnd : QEvent::TouchUpdate, static_cast<QKeyEvent*>(event)->timestamp());
     }
@@ -78,18 +78,18 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
         const QMouseEvent* const mouseEvent = static_cast<QMouseEvent*>(event);
 
         QEventPoint touchPoint;
-        QMutableEventPoint::setPressure(touchPoint, 1);
+        QMutableEventPoint::from(touchPoint).setPressure(1);
 
         QEvent::Type touchType = QEvent::None;
 
         switch (mouseEvent->type()) {
         case QEvent::MouseButtonPress:
-            QMutableEventPoint::setId(touchPoint, mouseEvent->button());
+            QMutableEventPoint::from(touchPoint).setId(mouseEvent->button());
             if (m_touchPoints.contains(touchPoint.id())) {
-                QMutableEventPoint::setState(touchPoint, QEventPoint::Updated);
+                QMutableEventPoint::from(touchPoint).setState(QEventPoint::Updated);
                 touchType = QEvent::TouchUpdate;
             } else {
-                QMutableEventPoint::setState(touchPoint, QEventPoint::Pressed);
+                QMutableEventPoint::from(touchPoint).setState(QEventPoint::Pressed);
                 // Check if more buttons are held down than just the event triggering one.
                 if (mouseEvent->buttons() > mouseEvent->button())
                     touchType = QEvent::TouchUpdate;
@@ -107,8 +107,8 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
                 return true;
             }
             touchType = QEvent::TouchUpdate;
-            QMutableEventPoint::setId(touchPoint, mouseEvent->buttons());
-            QMutableEventPoint::setState(touchPoint, QEventPoint::Updated);
+            QMutableEventPoint::from(touchPoint).setId(mouseEvent->buttons());
+            QMutableEventPoint::from(touchPoint).setState(QEventPoint::Updated);
             break;
         case QEvent::MouseButtonRelease:
             // Check if any buttons are still held down after this event.
@@ -116,8 +116,8 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
                 touchType = QEvent::TouchUpdate;
             else
                 touchType = QEvent::TouchEnd;
-            QMutableEventPoint::setId(touchPoint, mouseEvent->button());
-            QMutableEventPoint::setState(touchPoint, QEventPoint::Released);
+            QMutableEventPoint::from(touchPoint).setId(mouseEvent->button());
+            QMutableEventPoint::from(touchPoint).setState(QEventPoint::Released);
             break;
         case QEvent::MouseButtonDblClick:
             // Eat double-clicks, their accompanying press event is all we need.
@@ -146,7 +146,7 @@ bool TouchMockingApplication::notify(QObject* target, QEvent* event)
         // Update states for all other touch-points
         for (QHash<int, QEventPoint>::iterator it = m_touchPoints.begin(), end = m_touchPoints.end(); it != end; ++it) {
             if (!(it.value().id() & touchPoint.id()))
-                QMutableEventPoint::setState(it.value(), QEventPoint::Stationary);
+                QMutableEventPoint::from(it.value()).setState(QEventPoint::Stationary);
         }
 
         Q_ASSERT(touchType != QEvent::None);
@@ -177,18 +177,18 @@ void TouchMockingApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QE
     // but since the canvas translates touch events we actually need to pass
     // the screen position as the scene position to deliver the appropriate
     // coordinates to the target.
-    QMutableEventPoint::setPosition(touchPoint, mouseEvent->position());
-    QMutableEventPoint::setScenePosition(touchPoint, mouseEvent->globalPosition());
+    QMutableEventPoint::from(touchPoint).setPosition(mouseEvent->position());
+    QMutableEventPoint::from(touchPoint).setScenePosition(mouseEvent->globalPosition());
 
     if (touchPoint.state() == QEventPoint::Pressed)
-        QMutableEventPoint::setScenePosition(touchPoint, mouseEvent->scenePosition());
+        QMutableEventPoint::from(touchPoint).setScenePosition(mouseEvent->scenePosition());
     else {
         const QEventPoint& oldTouchPoint = m_touchPoints[mouseButton];
-        QMutableEventPoint::setGlobalLastPosition(touchPoint, oldTouchPoint.globalPosition());
+        QMutableEventPoint::from(touchPoint).setGlobalLastPosition(oldTouchPoint.globalPosition());
     }
 
     // Update current touch-point.
-    QMutableEventPoint::setId(touchPoint, mouseButton);
+    QMutableEventPoint::from(touchPoint).setId(mouseButton);
     m_touchPoints.insert(mouseButton, touchPoint);
 }
 
-- 
cgit v1.2.3


From 4b564a587a699425145bbe10b40d453bcbdc91c9 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Fri, 10 Nov 2023 13:35:37 +0100
Subject: Fix accessibility crash on elements with cell role

Not only tables can have cell as a child.

Fixes: QTBUG-119023
Task-number: QTBUG-113859
Change-Id: Ic997f752059f5ac3cac9a7d7cf1fefcecbc2ddd5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit ea0682573613c1bad9d65b3e7d61f58708026c31)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5163615d6404ee4df5754f629298b1f2290514f3)
---
 .../widgets/accessibility/tst_accessibility.cpp    | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 68566c082..f2cd4d05d 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -50,6 +50,7 @@ private Q_SLOTS:
     void roles();
     void objectName();
     void crossTreeParent();
+    void tableCellInterface();
 };
 
 // This will be called before the first test function is executed.
@@ -605,6 +606,58 @@ void tst_Accessibility::crossTreeParent()
     QCOMPARE(p->object()->objectName(), QStringLiteral("my_id"));
 }
 
+void tst_Accessibility::tableCellInterface()
+{
+    QWebEngineView webView;
+    webView.resize(400, 400);
+    webView.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&webView));
+
+    QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished);
+    webView.setHtml(QLatin1String(
+            "<html><body>"
+            "  <ul>"
+            "    <li><a href='#link1' id='link1'>Link in ListItem</a></li>"
+            "  </ul>"
+            ""
+            "  <div role='rowgroup'>"
+            "    <div role='row'>"
+            "      <span role='cell'><a href='#link2' id='link2'>Link in Cell</a></span>"
+            "    </div>"
+            "  </div>"
+            "</body></html>"));
+    QTRY_COMPARE(spyFinished.size(), 1);
+
+    QAccessibleInterface *view = QAccessible::queryAccessibleInterface(&webView);
+    QAccessibleInterface *document = view->child(0);
+    QTRY_COMPARE(document->childCount(), 2);
+
+    // ListItem without Table parent.
+    {
+        QAccessibleInterface *list = document->child(0);
+        QAccessibleInterface *listItem = list->child(0);
+        QVERIFY(!listItem->tableCellInterface());
+
+        // Should not crash.
+        QPoint linkCenter = elementCenter(webView.page(), QLatin1String("link1"));
+        QTest::mouseClick(webView.focusProxy(), Qt::LeftButton, {}, linkCenter);
+        QTRY_COMPARE(webView.url().fragment(), QLatin1String("link1"));
+    }
+
+    // Cell without Table parent.
+    {
+        QAccessibleInterface *rowgroup = document->child(1);
+        QAccessibleInterface *row = rowgroup->child(0);
+        QAccessibleInterface *cell = row->child(0);
+        QVERIFY(!cell->tableCellInterface());
+
+        // Should not crash.
+        QPoint linkCenter = elementCenter(webView.page(), QLatin1String("link2"));
+        QTest::mouseClick(webView.focusProxy(), Qt::LeftButton, {}, linkCenter);
+        QTRY_COMPARE(webView.url().fragment(), QLatin1String("link2"));
+    }
+}
+
 static QByteArrayList params = QByteArrayList()
     << "--force-renderer-accessibility"
     << "--enable-features=AccessibilityExposeARIAAnnotations";
-- 
cgit v1.2.3