Merge "Merge remote-tracking branch 'origin/6.4.3' into tqtc/lts-6.2"

155 files changed, 2819 insertions, 1226 deletions

diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION
index dbb6e8307..1a76113ad 100644
--- a/CHROMIUM_VERSION
+++ b/CHROMIUM_VERSION
@@ -1,3 +1,3 @@
 
 Based on Chromium version:                                      102.0.5005.177
-Patched with security patches up to Chromium version:           107.0.5304.110
+Patched with security patches up to Chromium version:           110.0.5481.78
diff --git a/configure.cmake b/configure.cmake
index 5d08d045f..e8f2a6a3b 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -3,6 +3,8 @@ if(QT_CONFIGURE_RUNNING)
     endfunction()
     function(add_check_for_support)
     endfunction()
+    function(check_for_ulimit)
+    endfunction()
 else()
     find_package(Ninja 1.7.2)
     find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT)
@@ -44,7 +46,7 @@ if(PkgConfig_FOUND)
     pkg_check_modules(LCMS2 lcms2)
     pkg_check_modules(FREETYPE freetype2 IMPORTED_TARGET)
     pkg_check_modules(LIBXML2 libxml-2.0 libxslt IMPORTED_TARGET)
-    pkg_check_modules(FFMPEG libavcodec libavformat libavutil)
+    pkg_check_modules(FFMPEG libavcodec libavformat libavutil IMPORTED_TARGET)
     pkg_check_modules(OPUS opus>=1.3.1)
     pkg_check_modules(VPX vpx>=1.10.0 IMPORTED_TARGET)
     pkg_check_modules(LIBPCI libpci)
@@ -97,6 +99,7 @@ int main() {
     pkt.data.frame.height[0] = 0u;
     auto a = CONSTRAINED_FROM_ABOVE_DROP;
     auto b = VPX_IMG_FMT_NV12;
+    auto v9 = vpx_codec_vp9_cx();
 }"
 )
 
@@ -200,6 +203,25 @@ int main(void){
 }"
 )
 
+qt_config_compile_test(libavformat
+    LABEL "libavformat"
+    LIBRARIES
+        PkgConfig::FFMPEG
+    CODE
+"
+#include \"libavformat/version.h\"
+extern \"C\" {
+#include \"libavformat/avformat.h\"
+}
+int main(void) {
+#if LIBAVFORMAT_VERSION_MAJOR >= 59
+    AVStream stream;
+    auto first_dts = av_stream_get_first_dts(&stream);
+#endif
+    return 0;
+}"
+)
+
 #### Features
 
 qt_feature("qtwebengine-build" PUBLIC
@@ -342,7 +364,6 @@ qt_feature("webengine-system-minizip" PRIVATE
 )
 qt_feature("webengine-system-libevent" PRIVATE
     LABEL "libevent"
-    AUTODETECT FALSE # coin bug 711
     CONDITION UNIX AND LIBEVENT_FOUND
 )
 qt_feature("webengine-system-libxml" PRIVATE
@@ -522,6 +543,11 @@ add_check_for_support(
    CONDITION NOT LINUX OR DBUS_FOUND
    MESSAGE "Build requires dbus."
 )
+add_check_for_support(
+    MODULES QtWebEngine
+    CONDITION NOT LINUX OR NOT QT_FEATURE_webengine_system_ffmpeg OR TEST_libavformat
+    MESSAGE "Unmodified ffmpeg >= 5.0 is not supported."
+)
 # FIXME: This prevents non XCB Linux builds from building:
 set(xcbSupport X11 LIBDRM XCOMPOSITE XCURSOR XRANDR XI XPROTO XSHMFENCE XTST)
 foreach(xs ${xcbSupport})
diff --git a/examples/webenginequick/quicknanobrowser/BrowserDialog.qml b/examples/webenginequick/quicknanobrowser/BrowserDialog.qml
index c155c3f35..7af347ec3 100644
--- a/examples/webenginequick/quicknanobrowser/BrowserDialog.qml
+++ b/examples/webenginequick/quicknanobrowser/BrowserDialog.qml
@@ -8,7 +8,7 @@ import QtWebEngine
 Window {
     id: window
     property alias currentWebView: webView
-    flags: Qt.Dialog | Qt.WindowStaysOnTopHint
+    flags: Qt.Dialog
     width: 800
     height: 600
     visible: true
diff --git a/examples/webenginequick/quicknanobrowser/BrowserWindow.qml b/examples/webenginequick/quicknanobrowser/BrowserWindow.qml
index 7c2a21cd5..99d9785b0 100644
--- a/examples/webenginequick/quicknanobrowser/BrowserWindow.qml
+++ b/examples/webenginequick/quicknanobrowser/BrowserWindow.qml
@@ -1,7 +1,7 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-import Qt.labs.settings
+import QtCore
 import QtQml
 import QtQuick
 import QtQuick.Controls
@@ -510,6 +510,8 @@ ApplicationWindow {
                         }
                     }
                 ]
+                settings.localContentCanAccessRemoteUrls: true
+                settings.localContentCanAccessFileUrls: false
                 settings.autoLoadImages: appSettings.autoLoadImages
                 settings.javascriptEnabled: appSettings.javaScriptEnabled
                 settings.errorPageEnabled: appSettings.errorPageEnabled
diff --git a/examples/webenginewidgets/CMakeLists.txt b/examples/webenginewidgets/CMakeLists.txt
index d9b12607f..89c147fbd 100644
--- a/examples/webenginewidgets/CMakeLists.txt
+++ b/examples/webenginewidgets/CMakeLists.txt
@@ -20,3 +20,6 @@ if(QT_FEATURE_webengine_spellchecker AND NOT CMAKE_CROSSCOMPILING
     AND NOT QT_FEATURE_webengine_native_spellchecker AND NOT WIN32)
     qt_internal_add_example(spellchecker)
 endif()
+if(QT_FEATURE_ssl)
+    qt_internal_add_example(clientcertificate)
+endif()
diff --git a/examples/webenginewidgets/clientcertificate/CMakeLists.txt b/examples/webenginewidgets/clientcertificate/CMakeLists.txt
new file mode 100644
index 000000000..8878bb7da
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+cmake_minimum_required(VERSION 3.16)
+project(clientcertificate LANGUAGES CXX)
+
+set(CMAKE_AUTOMOC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+    set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/clientcertificate")
+
+find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets)
+
+qt_add_executable(server
+    server.cpp
+)
+
+qt_add_executable(client
+    client.cpp
+)
+
+set_target_properties(client PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
+qt_add_resources(client "client"
+    PREFIX
+        "/"
+    FILES
+       "resources/client.pem"
+       "resources/client.key"
+)
+
+qt_add_resources(server "server"
+    PREFIX
+        "/"
+    FILES
+       "resources/server.pem"
+       "resources/server.key"
+       "resources/ca.pem"
+)
+
+target_link_libraries(client PUBLIC
+    Qt::WebEngineWidgets
+)
+
+target_link_libraries(server PUBLIC
+    Qt::Core
+    Qt::Network
+)
+
+install(TARGETS server client
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/webenginewidgets/clientcertificate/client.cpp b/examples/webenginewidgets/clientcertificate/client.cpp
new file mode 100644
index 000000000..1227fa28e
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/client.cpp
@@ -0,0 +1,67 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+#include <QtCore/qfile.h>
+#include <QtNetwork/qsslkey.h>
+#include <QtWebEngineCore/qwebenginecertificateerror.h>
+#include <QtWebEngineCore/qwebengineclientcertificatestore.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
+#include <QtWebEngineCore/qwebenginepage.h>
+#include <QtWebEngineWidgets/qwebengineview.h>
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qdialog.h>
+#include <QtWidgets/qlabel.h>
+#include <QtWidgets/qlistwidget.h>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qboxlayout.h>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication::setOrganizationName("QtExamples");
+    QApplication app(argc, argv);
+
+    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::defaultProfile()->clientCertificateStore()->add(cert, sslKey);
+
+    QWebEnginePage page;
+    QObject::connect(&page, &QWebEnginePage::certificateError,
+                     [](QWebEngineCertificateError e) { e.acceptCertificate(); });
+
+    QObject::connect(
+            &page, &QWebEnginePage::selectClientCertificate, &page,
+            [&cert](QWebEngineClientCertificateSelection selection) {
+                QDialog dialog;
+                QVBoxLayout *layout = new QVBoxLayout;
+                QLabel *label = new QLabel(QLatin1String("Select certificate"));
+                QListWidget *listWidget = new QListWidget;
+                listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+                QPushButton *button = new QPushButton(QLatin1String("Select"));
+                layout->addWidget(label);
+                layout->addWidget(listWidget);
+                layout->addWidget(button);
+                QObject::connect(button, &QPushButton::clicked, [&dialog]() { dialog.accept(); });
+                const QList<QSslCertificate> &list = selection.certificates();
+                for (const QSslCertificate &cert : list) {
+                    listWidget->addItem(cert.subjectDisplayName() + " : " + cert.serialNumber());
+                }
+                dialog.setLayout(layout);
+                if (dialog.exec() == QDialog::Accepted)
+                    selection.select(list[listWidget->currentRow()]);
+                else
+                    selection.selectNone();
+            });
+
+    QWebEngineView view(&page);
+    view.setUrl(QUrl("https://localhost:5555"));
+    view.resize(800, 600);
+    view.show();
+
+    return app.exec();
+}
diff --git a/examples/webenginewidgets/clientcertificate/client.pro b/examples/webenginewidgets/clientcertificate/client.pro
new file mode 100644
index 000000000..e397d5efa
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/client.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += webenginewidgets
+
+SOURCES += client.cpp
+
+RESOURCES += resources/client.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/clientcertificate/client
+INSTALLS += target
diff --git a/examples/webenginewidgets/clientcertificate/clientcertificate.pro b/examples/webenginewidgets/clientcertificate/clientcertificate.pro
new file mode 100644
index 000000000..66039d05c
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/clientcertificate.pro
@@ -0,0 +1,7 @@
+QT_FOR_CONFIG += network-private
+TEMPLATE = subdirs
+
+client.file = client.pro
+server.file = server.pro
+
+qtConfig(ssl): SUBDIRS += client server
diff --git a/examples/webenginewidgets/clientcertificate/doc/images/granted.png b/examples/webenginewidgets/clientcertificate/doc/images/granted.png
new file mode 100644
index 000000000..b2def9b5e
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/doc/images/granted.png
diff --git a/examples/webenginewidgets/clientcertificate/doc/images/selection.png b/examples/webenginewidgets/clientcertificate/doc/images/selection.png
new file mode 100644
index 000000000..2756ac7be
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/doc/images/selection.png
diff --git a/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc b/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc
new file mode 100644
index 000000000..427e5052c
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/doc/src/clientcertificate.qdoc
@@ -0,0 +1,159 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \example webenginewidgets/clientcertificate
+    \title WebEngine Widgets Client Certificate Example
+    \ingroup webengine-widgetexamples
+    \brief A simple client certificate authentication scenario using \QWE and \l QSslServer.
+
+    \image selection.png
+
+    In this example we are going to show a client certificate authentication workflow.
+    The presented authentication scenario can be for example implemented
+    for an embedded device, which provides a web interface to handle its functionality.
+    The administrator uses the \QWE powered client to maintain the embedded device
+    and has a custom SSL certificate to authenticate.
+    The connection is encrypted with SSL sockets. The embedded device uses
+    a \c QSslSocket to handle the authentication and the encryption. This way the
+    administrator does not have to enter any credentials and just needs to select
+    a proper certificate that is recognized by the device.
+
+    In the example we focus on a very simple and minimalistic approach to demonstrate
+    the workflow. Note that QSslSocket is a low level solution as we do not have to
+    run a full-blown HTTPS server on the resource limited embedded device.
+
+    \section1 Creating Certificates
+
+    The example comes with certificates already generated, but let's see how to generate
+    new ones. We create certificates for the server and the client using
+    \l{https://www.openssl.org}{OpenSSL tooling}.
+
+    First, we create the certificate signing request \c CSR and sign it. We will use
+    a CA private key to sign and issue both local certificates for the client and the server.
+
+    \badcode
+    openssl req -out ca.pem -new -x509 -nodes -keyout ca.key
+    \endcode
+
+    \note Specify the \c {-days} option to override the default certificate validity of 30 days.
+
+    Now, let's create two private keys for our client and a server:
+
+    \badcode
+    openssl genrsa -out client.key 2048
+    \endcode
+    \badcode
+    openssl genrsa -out server.key 2048
+    \endcode
+
+    Next we need two certificate signing requests:
+
+    \badcode
+    openssl req -key client.key -new -out client.req
+    \endcode
+    \badcode
+    openssl req -key server.key -new -out server.req
+    \endcode
+
+    Let's issue now both certificates from CSRs:
+
+    \badcode
+    openssl x509 -req -in client.req -out client.pem -CA ca.pem -CAkey ca.key
+    \endcode
+    \badcode
+    openssl x509 -req -in server.req -out server.pem -CA ca.pem -CAkey ca.key
+    \endcode
+
+    The client certificate subject and the serial number will be displayed for
+    selection during authentication. The serial number can be printed with:
+
+    \badcode
+    openssl x509 -serial -noout -in client.pem
+    \endcode
+
+    \section1 Implementing the Client
+
+    Now we can implement our web browser client.
+
+    We start by loading our certificate and its private key and creating \l QSslCertificate
+    and \l QSslKey instances.
+
+
+    \quotefromfile webenginewidgets/clientcertificate/client.cpp
+    \skipto QFile
+    \printuntil QSslKey
+
+    Now we add the certificate and its private key to \l {QWebEngineClientCertificateStore}.
+
+    \printuntil clientCertificateStore
+
+    To handle certificates we need to create an instance of \l QWebEnginePage and connect to two
+    singals \l QWebEnginePage::certificateError and \l QWebEnginePage::selectClientCertificate.
+    The first one is only needed as our self-signed server certificate will trigger a certificate
+    error, which has to be accepted to proceed with the authentication. In production
+    environments self-signed certificates are not used, therefore in this example we handle
+    \l QWebEngineCertificateError just to avoid providing proper certificates.
+    Note the private key is a secret and should never be published.
+
+    \printuntil acceptCertificate
+
+    The handling for \l QWebEnginePage::selectClientCertificate simply displays \l QDialog
+    with \l QListWidget showing a list of client certificates to choose from.
+    The user selected certificate is then passed to the
+    \l QWebEngineClientCertificateSelection::select call.
+
+    \printto QWebEngineView
+
+    Finally, we create a \l QWebEngineView for our \l QWebEnginePage, load the server
+    URL, and show the page.
+
+    \printuntil show
+
+    \section1 Implementing the Server
+
+    For our embedded device we will develop a minimalistic HTTPS server. We can use \l QSslServer
+    to handle incoming connections and to provide an \l QSslSocket instance. To do that,
+    we create an instance of a \l QSslServer and, similarly to our client setup, we load a server
+    certificate and its private key. Next, we create \l QSslCertificate and \l QSslKey objects
+    accordingly. Additionally, we need a CA certificate so the server can validate the certificate
+    presented by the client. The CA and local certificate are set to \l QSslConfiguration and
+    used later by the server.
+
+    \quotefromfile webenginewidgets/clientcertificate/server.cpp
+    \skipto QSslServer
+    \printuntil setSslConfiguration
+
+    Next, we set the server to listen for incoming connections on port \c 5555
+
+    \printuntil qInfo
+
+    We provide a lambda function for the \l QTcpServer::pendingConnectionAvailable signal,
+    where we implement handling for incoming connections. This signal is triggered
+    after authentication has succeeded and \c socket TLS encryption has started.
+
+    \printto readyRead
+
+    The \c Request object used above is a simple wrapper around \l QByteArray as we use
+    \l QPointer to help with memory management. This object gathers incoming HTTP data.
+    It is deleted when the request has completed or a socket has been terminated.
+
+    \quotefromfile webenginewidgets/clientcertificate/server.cpp
+    \skipto struct
+    \printuntil };
+
+    The reply for the request depends on the requested URL, and it is sent back through
+    the socket in form of a HTML page. For the \c GET root request the administrator sees
+    the \c {Access Granted} message and an \c {Exit} HTML button. If the administrator clicks it,
+    the client sends another request. This time with the \c{/exit} relative URL,
+    which it turn triggers the server termination.
+
+    \quotefromfile webenginewidgets/clientcertificate/server.cpp
+    \skipto readyRead
+    \printuntil });
+
+    To run the example, start the \c server and then the \c client. After you select
+    the certificate, the \c {Access Granted} page is displayed.
+
+    \image granted.png
+*/
diff --git a/examples/webenginewidgets/clientcertificate/resources/ca.pem b/examples/webenginewidgets/clientcertificate/resources/ca.pem
new file mode 100644
index 000000000..cb62ad62c
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/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/examples/webenginewidgets/clientcertificate/resources/client.key b/examples/webenginewidgets/clientcertificate/resources/client.key
new file mode 100644
index 000000000..21c8e3183
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/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/examples/webenginewidgets/clientcertificate/resources/client.pem b/examples/webenginewidgets/clientcertificate/resources/client.pem
new file mode 100644
index 000000000..dd1f898f7
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/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/examples/webenginewidgets/clientcertificate/resources/client.qrc b/examples/webenginewidgets/clientcertificate/resources/client.qrc
new file mode 100644
index 000000000..cc3492e80
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/resources/client.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/resources">
+        <file>client.key</file>
+        <file>client.pem</file>
+    </qresource>
+</RCC>
diff --git a/examples/webenginewidgets/clientcertificate/resources/server.key b/examples/webenginewidgets/clientcertificate/resources/server.key
new file mode 100644
index 000000000..632cc4d2e
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/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/examples/webenginewidgets/clientcertificate/resources/server.pem b/examples/webenginewidgets/clientcertificate/resources/server.pem
new file mode 100644
index 000000000..4706fa73e
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/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/examples/webenginewidgets/clientcertificate/resources/server.qrc b/examples/webenginewidgets/clientcertificate/resources/server.qrc
new file mode 100644
index 000000000..502afa9cc
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/resources/server.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/resources">
+        <file>server.key</file>
+        <file>server.pem</file>
+        <file>ca.pem</file>
+    </qresource>
+</RCC>
diff --git a/examples/webenginewidgets/clientcertificate/server.cpp b/examples/webenginewidgets/clientcertificate/server.cpp
new file mode 100644
index 000000000..ee83dab8a
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/server.cpp
@@ -0,0 +1,99 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qtimer.h>
+#include <QtNetwork/qsslconfiguration.h>
+#include <QtNetwork/qsslkey.h>
+#include <QtNetwork/qsslserver.h>
+
+struct Request : public QObject
+{
+    QByteArray m_data;
+};
+
+static const QByteArray http_ok(QByteArrayLiteral(
+        "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n"));
+static const QByteArray html_start(QByteArrayLiteral("<html><style>"
+                                                     "div {"
+                                                     "height: 400px;"
+                                                     "width: 200px;"
+                                                     "position: fixed;"
+                                                     "top: 50%;"
+                                                     "left: 50%;"
+                                                     "margin-top: -100px;"
+                                                     "margin-left: -200px;"
+                                                     "}</style><body><div>"));
+static const QByteArray html_end(QByteArrayLiteral("</div></body></html>"));
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication::setOrganizationName("QtExamples");
+    QCoreApplication app(argc, argv);
+
+    QSslServer server;
+    QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
+    configuration.setPeerVerifyMode(QSslSocket::VerifyPeer);
+
+    QFile keyFile(":/resources/server.key");
+    keyFile.open(QIODevice::ReadOnly);
+
+    QSslKey key(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
+    configuration.setPrivateKey(key);
+
+    QList<QSslCertificate> localCerts = QSslCertificate::fromPath(":/resources/server.pem");
+    configuration.setLocalCertificateChain(localCerts);
+
+    QList<QSslCertificate> caCerts = QSslCertificate::fromPath(":resources/ca.pem");
+    configuration.addCaCertificates(caCerts);
+
+    server.setSslConfiguration(configuration);
+
+    if (!server.listen(QHostAddress::LocalHost, 5555))
+        qFatal("Could not start server on localhost:5555");
+    else
+        qInfo("Server started on localhost:5555");
+
+    QObject::connect(&server, &QTcpServer::pendingConnectionAvailable, [&server]() {
+        QTcpSocket *socket = server.nextPendingConnection();
+        Q_ASSERT(socket);
+
+        QPointer<Request> request(new Request);
+
+        QObject::connect(socket, &QAbstractSocket::disconnected, socket,
+                         [socket, request]() mutable {
+                             delete request;
+                             socket->deleteLater();
+                         });
+
+        QObject::connect(socket, &QTcpSocket::readyRead, socket, [socket, request]() mutable {
+            request->m_data.append(socket->readAll());
+
+            if (!request->m_data.endsWith("\r\n\r\n"))
+                return;
+
+            socket->write(http_ok);
+            socket->write(html_start);
+
+            if (request->m_data.startsWith("GET / ")) {
+                socket->write("<p>ACCESS GRANTED !</p>");
+                socket->write("<p>You reached the place, where no one has gone before.</p>");
+                socket->write("<button onclick=\"window.location.href='/exit'\">Exit</button>");
+            } else if (request->m_data.startsWith("GET /exit ")) {
+                socket->write("<p>BYE !</p>");
+                socket->write("<p>Have good day ...</p>");
+                QTimer::singleShot(0, &QCoreApplication::quit);
+            } else {
+                socket->write("<p>There is nothing to see here.</p>");
+            }
+
+            socket->write(html_end);
+            delete request;
+            socket->disconnectFromHost();
+        });
+    });
+
+    return app.exec();
+}
diff --git a/examples/webenginewidgets/clientcertificate/server.pro b/examples/webenginewidgets/clientcertificate/server.pro
new file mode 100644
index 000000000..b8fda1717
--- /dev/null
+++ b/examples/webenginewidgets/clientcertificate/server.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+
+QT += core network
+CONFIG += console
+
+SOURCES += server.cpp
+
+RESOURCES += resources/server.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/clientcertificate/server
+INSTALLS += target
diff --git a/examples/webenginewidgets/maps/doc/src/maps.qdoc b/examples/webenginewidgets/maps/doc/src/maps.qdoc
index 43728d081..547572750 100644
--- a/examples/webenginewidgets/maps/doc/src/maps.qdoc
+++ b/examples/webenginewidgets/maps/doc/src/maps.qdoc
@@ -15,7 +15,7 @@
     The \l {https://www.w3.org/TR/geolocation-API/}{Geolocation API} is a
     JavaScript API that web applications can use to determine the user's
     physical location to show on a map, for example. As \QWE relies on the
-    \e {Qt Location} module to power this API, a viable location backend is
+    \e {Qt Positioning} module to power this API, a viable location backend is
     needed for the target platform.
 
     To avoid accidentally sending location information to third parties
diff --git a/examples/webenginewidgets/simplebrowser/browser.cpp b/examples/webenginewidgets/simplebrowser/browser.cpp
index c1f5ddd55..f1ed68739 100644
--- a/examples/webenginewidgets/simplebrowser/browser.cpp
+++ b/examples/webenginewidgets/simplebrowser/browser.cpp
@@ -23,6 +23,8 @@ BrowserWindow *Browser::createHiddenWindow(bool offTheRecord)
                 QString::fromLatin1("simplebrowser.%1").arg(qWebEngineChromiumVersion())));
         m_profile->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);
         m_profile->settings()->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true);
+        m_profile->settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, true);
+        m_profile->settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false);
         QObject::connect(m_profile.get(), &QWebEngineProfile::downloadRequested,
                          &m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested);
     }
diff --git a/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp b/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
index cbe678fc8..ab786d5c9 100644
--- a/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
+++ b/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
@@ -27,7 +27,7 @@ MainWindow::MainWindow(const QUrl &url) :
         // Add back default style sheets if the user cleared them out
         loadDefaultStyleSheets();
     } else {
-        for (auto name : qAsConst(styleSheets)) {
+        for (auto name : std::as_const(styleSheets)) {
             StyleSheet styleSheet = settings.value(name).value<StyleSheet>();
             if (styleSheet.second)
                 insertStyleSheet(name, styleSheet.first, false);
diff --git a/examples/webenginewidgets/webenginewidgets.pro b/examples/webenginewidgets/webenginewidgets.pro
index c88b7874e..ffc221147 100644
--- a/examples/webenginewidgets/webenginewidgets.pro
+++ b/examples/webenginewidgets/webenginewidgets.pro
@@ -1,4 +1,4 @@
-QT_FOR_CONFIG += webenginecore webenginecore-private
+QT_FOR_CONFIG += webenginecore webenginecore-private network-private
 
 TEMPLATE=subdirs
 
@@ -25,3 +25,4 @@ qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross
     message("Spellchecker example will not be built because it depends on usage of Hunspell dictionaries.")
 }
 
+qtConfig(ssl): SUBDIRS += clientcertificate
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 5e7f517eade60dd5f9409f32a44a8c5f897bb8c
+Subproject 447f5cb72905af87851b4c10c5e728f58cea46b
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0ed47a676..b861a45c8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -125,7 +125,7 @@ foreach(arch ${archs})
                 login_delegate_qt.cpp login_delegate_qt.h
                 media_capture_devices_dispatcher.cpp media_capture_devices_dispatcher.h
                 native_web_keyboard_event_qt.cpp
-                net/client_cert_override.cpp net/client_cert_override.h
+                net/client_cert_qt.cpp net/client_cert_qt.h
                 net/client_cert_store_data.cpp net/client_cert_store_data.h
                 net/cookie_monster_delegate_qt.cpp net/cookie_monster_delegate_qt.h
                 net/custom_url_loader_factory.cpp net/custom_url_loader_factory.h
@@ -222,8 +222,6 @@ foreach(arch ${archs})
         extend_gn_target(${buildGn} CONDITION QT_FEATURE_webengine_printing_and_pdf
             SOURCES
                 printing/pdfium_document_wrapper_qt.cpp printing/pdfium_document_wrapper_qt.h
-                printing/pdf_web_contents_helper_client_qt.cpp printing/pdf_web_contents_helper_client_qt.h
-                printing/pdf_stream_delegate_qt.cpp printing/pdf_stream_delegate_qt.h
                 printing/print_view_manager_base_qt.cpp printing/print_view_manager_base_qt.h
                 printing/print_view_manager_qt.cpp printing/print_view_manager_qt.h
                 printing/printer_worker.cpp printing/printer_worker.h
@@ -265,6 +263,8 @@ foreach(arch ${archs})
         extend_gn_target(${buildGn} CONDITION QT_FEATURE_webengine_extensions AND QT_FEATURE_webengine_printing_and_pdf
             SOURCES
                 extensions/pdf_iframe_navigation_throttle_qt.cpp extensions/pdf_iframe_navigation_throttle_qt.h
+                printing/pdf_stream_delegate_qt.cpp printing/pdf_stream_delegate_qt.h
+                printing/pdf_web_contents_helper_client_qt.cpp printing/pdf_web_contents_helper_client_qt.h
         )
 
         extend_gn_target(${buildGn} CONDITION WIN32
@@ -287,6 +287,7 @@ foreach(arch ${archs})
         list(APPEND gnArgArg
             qtwebengine_target="${buildDir}/${config}/${arch}:QtWebEngineCore"
             enable_ipc_fuzzer=false
+            enable_ipc_logging=false
             enable_media_remoting=false
             enable_message_center=false
             enable_nacl=false
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp
index e7837afce..3d231c05f 100644
--- a/src/core/api/qwebengineclientcertificatestore.cpp
+++ b/src/core/api/qwebengineclientcertificatestore.cpp
@@ -20,7 +20,21 @@ QT_BEGIN_NAMESPACE
     The class allows to store client certificates in an in-memory store.
     When a web site requests an SSL client certificate, the QWebEnginePage::selectClientCertificate
     signal is emitted with matching certificates from the native certificate store or the in-memory store.
-    The getInstance() method can be used to access the single instance of the class.
+
+    The class instance can be obtained with the QWebEngineProfile::clientCertificateStore() method.
+
+    \code
+    QFile certFile(":/resouces/certificate.crt");
+    certFile.open(QIODevice::ReadOnly);
+    const QSslCertificate cert(certFile.readAll(), QSsl::Pem);
+
+    QFile keyFile(":/resources/privatekey.key");
+    keyFile.open(QIODevice::ReadOnly);
+    const QSslKey sslKey(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, "");
+
+    QWebEngineProfile profile;
+    profile.clientCertificateStore()->add(cert, sslKey);
+    \endcode
 */
 
 QWebEngineClientCertificateStore::QWebEngineClientCertificateStore(QtWebEngineCore::ClientCertificateStoreData *storeData)
@@ -54,7 +68,7 @@ void QWebEngineClientCertificateStore::add(const QSslCertificate &certificate, c
 QList<QSslCertificate> QWebEngineClientCertificateStore::certificates() const
 {
     QList<QSslCertificate> certificateList;
-    for (auto data : qAsConst(m_storeData->extraCerts))
+    for (auto data : std::as_const(m_storeData->extraCerts))
         certificateList.append(data->certificate);
     return certificateList;
 }
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index c17fde475..6c4536a4a 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -58,7 +58,7 @@ void QWebEngineCookieStorePrivate::processPendingUserCookies()
     if (m_pendingUserCookies.isEmpty())
         return;
 
-    for (const CookieData &cookieData : qAsConst(m_pendingUserCookies)) {
+    for (const CookieData &cookieData : std::as_const(m_pendingUserCookies)) {
         if (cookieData.wasDelete)
             delegate->deleteCookie(cookieData.cookie, cookieData.origin);
         else
diff --git a/src/core/api/qwebenginedownloadrequest.cpp b/src/core/api/qwebenginedownloadrequest.cpp
index 97f6051b4..e51fe7c0f 100644
--- a/src/core/api/qwebenginedownloadrequest.cpp
+++ b/src/core/api/qwebenginedownloadrequest.cpp
@@ -123,20 +123,9 @@ static inline QWebEngineDownloadRequest::DownloadInterruptReason toDownloadInter
     QWebEnginePage::download, QWebEnginePage::save
 */
 
-QWebEngineDownloadRequestPrivate::QWebEngineDownloadRequestPrivate(QtWebEngineCore::ProfileAdapter *adapter, const QUrl &url)
-    : downloadFinished(false)
-    , downloadId(-1)
-    , downloadState(QWebEngineDownloadRequest::DownloadCancelled)
-    , savePageFormat(QWebEngineDownloadRequest::MimeHtmlSaveFormat)
-    , interruptReason(QWebEngineDownloadRequest::NoReason)
-    , downloadUrl(url)
-    , downloadPaused(false)
-    , isCustomFileName(false)
-    , totalBytes(-1)
-    , receivedBytes(0)
-    , isSavePageDownload(false)
-    , profileAdapter(adapter)
-    , adapterClient(nullptr)
+QWebEngineDownloadRequestPrivate::QWebEngineDownloadRequestPrivate(
+        QtWebEngineCore::ProfileAdapter *adapter)
+    : profileAdapter(adapter)
 {
 }
 
@@ -391,7 +380,7 @@ QWebEngineDownloadRequest::DownloadState QWebEngineDownloadRequest::state() cons
 }
 
 /*!
-    Returns the the total amount of data to download in bytes.
+    Returns the total amount of data to download in bytes.
 
     \c -1 means the size is unknown.
 */
diff --git a/src/core/api/qwebenginedownloadrequest_p.h b/src/core/api/qwebenginedownloadrequest_p.h
index 814af59cb..26afbc4ad 100644
--- a/src/core/api/qwebenginedownloadrequest_p.h
+++ b/src/core/api/qwebenginedownloadrequest_p.h
@@ -31,32 +31,35 @@ QT_BEGIN_NAMESPACE
 class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineDownloadRequestPrivate
 {
 public:
-    QWebEngineDownloadRequestPrivate(QtWebEngineCore::ProfileAdapter *adapter, const QUrl &url);
+    QWebEngineDownloadRequestPrivate(QtWebEngineCore::ProfileAdapter *adapter);
     ~QWebEngineDownloadRequestPrivate();
 
     void update(const QtWebEngineCore::ProfileAdapterClient::DownloadItemInfo &info);
     void setFinished();
 
-    bool downloadFinished;
-    quint32 downloadId;
+    bool downloadFinished = false;
+    quint32 downloadId = -1;
     qint64 startTime;
-    QWebEngineDownloadRequest::DownloadState downloadState;
-    QWebEngineDownloadRequest::SavePageFormat savePageFormat;
-    QWebEngineDownloadRequest::DownloadInterruptReason interruptReason;
+    QWebEngineDownloadRequest::DownloadState downloadState =
+            QWebEngineDownloadRequest::DownloadCancelled;
+    QWebEngineDownloadRequest::SavePageFormat savePageFormat =
+            QWebEngineDownloadRequest::MimeHtmlSaveFormat;
+    QWebEngineDownloadRequest::DownloadInterruptReason interruptReason =
+            QWebEngineDownloadRequest::NoReason;
     QString downloadPath;
-    const QUrl downloadUrl;
+    QUrl downloadUrl;
     QString mimeType;
-    bool downloadPaused;
+    bool downloadPaused = false;
     QString suggestedFileName;
     QString downloadDirectory;
     QString downloadFileName;
-    bool isCustomFileName;
-    qint64 totalBytes;
-    qint64 receivedBytes;
-    bool isSavePageDownload;
+    bool isCustomFileName = false;
+    qint64 totalBytes = -1;
+    qint64 receivedBytes = 0;
+    bool isSavePageDownload = false;
     QWebEngineDownloadRequest *q_ptr;
     QPointer<QtWebEngineCore::ProfileAdapter> profileAdapter;
-    QtWebEngineCore::WebContentsAdapterClient *adapterClient;
+    QtWebEngineCore::WebContentsAdapterClient *adapterClient = nullptr;
     Q_DECLARE_PUBLIC(QWebEngineDownloadRequest)
 };
 
diff --git a/src/core/api/qwebenginehttprequest.cpp b/src/core/api/qwebenginehttprequest.cpp
index bb822d6e3..050213d1e 100644
--- a/src/core/api/qwebenginehttprequest.cpp
+++ b/src/core/api/qwebenginehttprequest.cpp
@@ -151,7 +151,7 @@ QWebEngineHttpRequest QWebEngineHttpRequest::postRequest(const QUrl &url,
         QByteArray key = QUrl::toPercentEncoding(it.key());
         QByteArray value = QUrl::toPercentEncoding(it.value());
 
-        if (buffer.length() > 0)
+        if (buffer.size() > 0)
             buffer += '&';
         buffer.append(key).append('=').append(value);
     }
diff --git a/src/core/api/qwebenginenewwindowrequest.cpp b/src/core/api/qwebenginenewwindowrequest.cpp
index 951753136..895033fd1 100644
--- a/src/core/api/qwebenginenewwindowrequest.cpp
+++ b/src/core/api/qwebenginenewwindowrequest.cpp
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype WebEngineNewWindowRequest
     \instantiates QWebEngineNewWindowRequest
-    \inqmlmodule QtWebEngineQuick
+    \inqmlmodule QtWebEngine
     \since QtWebEngine 1.12
 
     \brief A utility type for the WebEngineView::newWindowRequested signal.
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index 3b83a0b97..072b39650 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -845,9 +845,9 @@ QWebEnginePage::~QWebEnginePage()
         setDevToolsPage(nullptr);
         emit _q_aboutToDelete();
 
-        for (auto varFun : qAsConst(d_ptr->m_variantCallbacks))
+        for (auto varFun : std::as_const(d_ptr->m_variantCallbacks))
             varFun(QVariant());
-        for (auto strFun : qAsConst(d_ptr->m_stringCallbacks))
+        for (auto strFun : std::as_const(d_ptr->m_stringCallbacks))
             strFun(QString());
         d_ptr->m_variantCallbacks.clear();
         d_ptr->m_stringCallbacks.clear();
diff --git a/src/core/api/qwebengineprofile.cpp b/src/core/api/qwebengineprofile.cpp
index 4eacc8dc7..445df4b52 100644
--- a/src/core/api/qwebengineprofile.cpp
+++ b/src/core/api/qwebengineprofile.cpp
@@ -186,11 +186,14 @@ void QWebEngineProfilePrivate::downloadRequested(DownloadItemInfo &info)
     Q_Q(QWebEngineProfile);
 
     Q_ASSERT(!m_ongoingDownloads.contains(info.id));
-    QWebEngineDownloadRequestPrivate *itemPrivate = new QWebEngineDownloadRequestPrivate(m_profileAdapter, info.url);
+    QWebEngineDownloadRequestPrivate *itemPrivate =
+            new QWebEngineDownloadRequestPrivate(m_profileAdapter);
     itemPrivate->downloadId = info.id;
     itemPrivate->downloadState = info.accepted ? QWebEngineDownloadRequest::DownloadInProgress
                                                : QWebEngineDownloadRequest::DownloadRequested;
     itemPrivate->startTime = info.startTime;
+    itemPrivate->downloadUrl = info.url;
+    itemPrivate->totalBytes = info.totalBytes;
     itemPrivate->downloadDirectory = QFileInfo(info.path).path();
     itemPrivate->downloadFileName = QFileInfo(info.path).fileName();
     itemPrivate->suggestedFileName = info.suggestedFileName;
diff --git a/src/core/api/qwebenginescriptcollection.cpp b/src/core/api/qwebenginescriptcollection.cpp
index 0b157755c..7867192b6 100644
--- a/src/core/api/qwebenginescriptcollection.cpp
+++ b/src/core/api/qwebenginescriptcollection.cpp
@@ -120,7 +120,7 @@ QWebEngineScriptCollectionPrivate::QWebEngineScriptCollectionPrivate(QtWebEngine
 
 int QWebEngineScriptCollectionPrivate::count() const
 {
-    return m_scripts.count();
+    return m_scripts.size();
 }
 
 bool QWebEngineScriptCollectionPrivate::contains(const QWebEngineScript &s) const
@@ -148,7 +148,7 @@ QList<QWebEngineScript> QWebEngineScriptCollectionPrivate::toList(const QString
         return m_scripts;
 
     QList<QWebEngineScript> ret;
-    for (const QWebEngineScript &script : qAsConst(m_scripts))
+    for (const QWebEngineScript &script : std::as_const(m_scripts))
         if (scriptName == script.name())
             ret.append(script);
     return ret;
@@ -173,7 +173,7 @@ void QWebEngineScriptCollectionPrivate::initializationFinished(QSharedPointer<Qt
     Q_ASSERT(m_contents);
     Q_ASSERT(contents);
 
-    for (const QWebEngineScript &script : qAsConst(m_scripts))
+    for (const QWebEngineScript &script : std::as_const(m_scripts))
         m_scriptController->addUserScript(*script.d, contents.data());
     m_contents = contents;
 }
diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index e330a16d9..716f53e73 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -6,8 +6,15 @@
 
 #include "web_contents_adapter_client.h"
 
+#include <memory>
+#include <utility>
+
 QT_BEGIN_NAMESPACE
 
+// We changed the type from QScopedPointer to unique_ptr, make sure it's binary compatible:
+static_assert(sizeof(QScopedPointer<QWebEngineUrlRequestInfoPrivate>)
+              == sizeof(std::unique_ptr<QWebEngineUrlRequestInfoPrivate>));
+
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::LinkNavigation, QWebEngineUrlRequestInfo::NavigationTypeLink)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::TypedNavigation, QWebEngineUrlRequestInfo::NavigationTypeTyped)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::FormSubmittedNavigation,
@@ -92,14 +99,17 @@ QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo() {}
 /*!
     \internal
 */
-QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p) : d_ptr(p.d_ptr.take()) {}
+QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p)
+    : d_ptr(std::move(p.d_ptr))
+{
+}
 
 /*!
     \internal
 */
 QWebEngineUrlRequestInfo &QWebEngineUrlRequestInfo::operator=(QWebEngineUrlRequestInfo &&p)
 {
-    d_ptr.reset(p.d_ptr.take());
+    d_ptr = std::move(p.d_ptr);
     return *this;
 }
 
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index 125e5373c..5d27bcb7a 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -6,9 +6,10 @@
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qurl.h>
 
+#include <memory>
+
 namespace QtWebEngineCore {
 class ContentBrowserClientQt;
 class InterceptedRequest;
@@ -86,7 +87,7 @@ private:
     QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p);
     QWebEngineUrlRequestInfo &operator=(QWebEngineUrlRequestInfo &&p);
     ~QWebEngineUrlRequestInfo();
-    QScopedPointer<QWebEngineUrlRequestInfoPrivate> d_ptr;
+    std::unique_ptr<QWebEngineUrlRequestInfoPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp
index 7c16d54a0..b5f978b89 100644
--- a/src/core/browser_accessibility_manager_qt.cpp
+++ b/src/core/browser_accessibility_manager_qt.cpp
@@ -97,6 +97,8 @@ void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,
     switch (event_type) {
     case ax::mojom::Event::kFocus: {
         QAccessibleEvent event(iface, QAccessible::Focus);
+        if (event.object())
+            event.setChild(-1);
         QAccessible::updateAccessibility(&event);
         break;
     }
@@ -104,6 +106,8 @@ void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,
         QAccessible::State change;
         change.checked = true;
         QAccessibleStateChangeEvent event(iface, change);
+        if (event.object())
+            event.setChild(-1);
         QAccessible::updateAccessibility(&event);
         break;
     }
@@ -112,6 +116,8 @@ void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,
         if (QAccessibleValueInterface *valueIface = iface->valueInterface())
             value = valueIface->currentValue();
         QAccessibleValueChangeEvent event(iface, value);
+        if (event.object())
+            event.setChild(-1);
         QAccessible::updateAccessibility(&event);
         break;
     }
@@ -123,6 +129,8 @@ void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,
         break;
     case ax::mojom::Event::kTextChanged: {
         QAccessibleTextUpdateEvent event(iface, -1, QString(), QString());
+        if (event.object())
+            event.setChild(-1);
         QAccessible::updateAccessibility(&event);
         break;
     }
@@ -134,9 +142,13 @@ void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,
             textIface->selection(0, &start, &end);
             if (start == end) {
                 QAccessibleTextCursorEvent event(iface, start);
+                if (event.object())
+                    event.setChild(-1);
                 QAccessible::updateAccessibility(&event);
             } else {
                 QAccessibleTextSelectionEvent event(iface, start, end);
+                if (event.object())
+                    event.setChild(-1);
                 QAccessible::updateAccessibility(&event);
             }
         }
@@ -156,6 +168,8 @@ void BrowserAccessibilityManagerQt::FireGeneratedEvent(ui::AXEventGenerator::Eve
     case ui::AXEventGenerator::Event::VALUE_IN_TEXT_FIELD_CHANGED:
         if (iface->role() == QAccessible::EditableText) {
             QAccessibleTextUpdateEvent event(iface, -1, QString(), QString());
+            if (event.object())
+                event.setChild(-1);
             QAccessible::updateAccessibility(&event);
         }
         break;
diff --git a/src/core/browser_main_parts_qt.cpp b/src/core/browser_main_parts_qt.cpp
index 10fc29ebf..62ad4f635 100644
--- a/src/core/browser_main_parts_qt.cpp
+++ b/src/core/browser_main_parts_qt.cpp
@@ -262,12 +262,12 @@ int BrowserMainPartsQt::PreMainMessageLoopRun()
     extensions::ExtensionsClient::Set(new extensions::ExtensionsClientQt());
     extensions::ExtensionsBrowserClient::Set(new extensions::ExtensionsBrowserClientQt());
     extensions::ExtensionSystemFactoryQt::GetInstance();
-#endif // BUILDFLAG(ENABLE_EXTENSIONS)
 
 #if BUILDFLAG(ENABLE_PLUGINS)
     content::PluginService *plugin_service = content::PluginService::GetInstance();
     plugin_service->SetFilter(extensions::PluginServiceFilterQt::GetInstance());
 #endif // BUILDFLAG(ENABLE_PLUGINS)
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
 
     if (base::FeatureList::IsEnabled(features::kWebUsb)) {
         m_webUsbDetector.reset(new WebUsbDetectorQt());
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index 69690dd99..009235a72 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -198,9 +198,11 @@ bool ClipboardQt::IsFormatAvailable(const ui::ClipboardFormatType &format,
     const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
             type == ui::ClipboardBuffer::kCopyPaste ? QClipboard::Clipboard : QClipboard::Selection);
 
-    if (format == ui::ClipboardFormatType::BitmapType())
-        return mimeData && mimeData->hasImage();
-    return mimeData && mimeData->hasFormat(QString::fromStdString(format.GetName()));
+    if (!mimeData)
+        return false;
+    if (format == ui::ClipboardFormatType::PngType())
+        return mimeData->hasImage();
+    return mimeData->hasFormat(QString::fromStdString(format.GetName()));
 }
 
 void ClipboardQt::Clear(ui::ClipboardBuffer type)
@@ -224,18 +226,13 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type,
             type == ui::ClipboardBuffer::kCopyPaste ? QClipboard::Clipboard : QClipboard::Selection);
     if (!mimeData)
         return;
-    if (mimeData->hasImage() && !mimeData->formats().contains(QStringLiteral("image/png")))
-        types->push_back(toString16(QStringLiteral("image/png")));
-    const QStringList formats = mimeData->formats();
-    for (const QString &mimeType : formats) {
-        // Special handling for chromium/x-web-custom-data. We must read the data
-        // and deserialize it to find the list of mime types to report.
-        if (mimeType == QString::fromLatin1(ui::kMimeTypeWebCustomData)) {
-            const QByteArray customData = mimeData->data(QString::fromLatin1(ui::kMimeTypeWebCustomData));
-            ui::ReadCustomDataTypes(customData.constData(), customData.size(), types);
-        } else {
-            types->push_back(toString16(mimeType));
-        }
+
+    for (const auto& mime_type : GetStandardFormats(type, data_dst))
+        types->push_back(mime_type);
+
+    if (mimeData->hasFormat(QString::fromLatin1(ui::kMimeTypeWebCustomData))) {
+        const QByteArray customData = mimeData->data(QString::fromLatin1(ui::kMimeTypeWebCustomData));
+        ui::ReadCustomDataTypes(customData.constData(), customData.size(), types);
     }
 }
 
@@ -438,12 +435,23 @@ std::vector<std::u16string> ClipboardQt::GetStandardFormats(ui::ClipboardBuffer
         return {};
 
     std::vector<std::u16string> types;
+    if (mimeData->hasImage())
+        types.push_back(base::UTF8ToUTF16(ui::kMimeTypePNG));
+    if (mimeData->hasHtml())
+        types.push_back(base::UTF8ToUTF16(ui::kMimeTypeHTML));
+    if (mimeData->hasText())
+        types.push_back(base::UTF8ToUTF16(ui::kMimeTypeText));
+    if (mimeData->hasUrls())
+        types.push_back(base::UTF8ToUTF16(ui::kMimeTypeURIList));
     const QStringList formats = mimeData->formats();
-    if (mimeData->hasImage() && !formats.contains(QStringLiteral("image/png")))
-        types.push_back(toString16(QStringLiteral("image/png")));
     for (const QString &mimeType : formats) {
-        if (mimeType != QString::fromLatin1(ui::kMimeTypeWebCustomData))
-            types.push_back(toString16(mimeType));
+        auto mime_type = mimeType.toStdString();
+        // Only add white-listed formats here
+        if (mime_type == ui::ClipboardFormatType::SvgType().GetName() ||
+            mime_type == ui::ClipboardFormatType::RtfType().GetName()) {
+          types.push_back(base::UTF8ToUTF16(mime_type));
+          continue;
+        }
     }
     return types;
 }
diff --git a/src/core/common/extensions/api/qtwebengine_extensions_features.gni b/src/core/common/extensions/api/qtwebengine_extensions_features.gni
deleted file mode 100644
index 3873e235a..000000000
--- a/src/core/common/extensions/api/qtwebengine_extensions_features.gni
+++ /dev/null
@@ -1,27 +0,0 @@
-import("//tools/json_schema_compiler/json_features.gni")
-
-json_features("qt_api_features") {
-  feature_type = "APIFeature"
-  method_name = "AddQtAPIFeatures"
-  sources = [
-    "//extensions/common/api/_webengine_api_features.json"
-  ]
-}
-
-json_features("qt_permission_features") {
-  feature_type = "PermissionFeature"
-  method_name = "AddQtPermissionFeatures"
-  sources = [
-    "//chrome/common/extensions/api/_permission_features.json",
-    "//extensions/common/api/_permission_features.json",
-  ]
-}
-
-group("qtwebengine_extensions_features") {
-  public_deps = [
-    ":qt_api_features",
-    ":qt_permission_features",
-    "//chrome/common/extensions/api:extensions_features",
-    "//extensions/common/api:extensions_features",
-  ]
-}
diff --git a/src/core/compositor/content_gpu_client_qt.cpp b/src/core/compositor/content_gpu_client_qt.cpp
index 4c022dc7f..9f3b00bb8 100644
--- a/src/core/compositor/content_gpu_client_qt.cpp
+++ b/src/core/compositor/content_gpu_client_qt.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "content_gpu_client_qt.h"
-
+#include "ozone/gl_share_context_qt.h"
 #include "web_engine_context.h"
 
 namespace QtWebEngineCore {
@@ -20,4 +20,11 @@ gpu::SyncPointManager *ContentGpuClientQt::GetSyncPointManager()
     return WebEngineContext::syncPointManager();
 }
 
+gl::GLShareGroup *ContentGpuClientQt::GetInProcessGpuShareGroup()
+{
+    if (!m_shareGroupQt.get())
+        m_shareGroupQt = new ShareGroupQt;
+    return m_shareGroupQt.get();
+}
+
 } // namespace
diff --git a/src/core/compositor/content_gpu_client_qt.h b/src/core/compositor/content_gpu_client_qt.h
index 75d9d68be..150c257ae 100644
--- a/src/core/compositor/content_gpu_client_qt.h
+++ b/src/core/compositor/content_gpu_client_qt.h
@@ -5,7 +5,12 @@
 
 #include "content/public/gpu/content_gpu_client.h"
 
+namespace gl {
+class GLShareGroup;
+}
+
 namespace QtWebEngineCore {
+class ShareGroupQt;
 
 class ContentGpuClientQt : public content::ContentGpuClient {
 public:
@@ -14,6 +19,10 @@ public:
 
     // content::ContentGpuClient implementation.
     gpu::SyncPointManager *GetSyncPointManager() override;
+    gl::GLShareGroup *GetInProcessGpuShareGroup() override;
+
+private:
+    scoped_refptr<ShareGroupQt> m_shareGroupQt;
 };
 
 }
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in
index 08faf24d5..efbb28075 100644
--- a/src/core/configure/BUILD.root.gn.in
+++ b/src/core/configure/BUILD.root.gn.in
@@ -33,7 +33,7 @@ if (moc_source_h_files != []) {
     script = "@WEBENGINE_ROOT_SOURCE_DIR@/tools/scripts/gn_run_binary.py"
     sources =  moc_source_h_files
     outputs = [ "${target_gen_dir}/.moc/moc_{{source_name_part}}.cpp" ]
-    inputs = [ "@WEBENGINE_ROOT_SOURCE_DIR@/CMakeLists.txt" ]
+    inputs = [ "@WEBENGINE_ROOT_SOURCE_DIR@/src/core/CMakeLists.txt" ]
     args = [
       @GN_ARGS_MOC_BIN@,
       @GN_ARGS_DEFINES@,
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 99a3aa3f4..f55e52eec 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -68,7 +68,6 @@
 #include "net/proxying_restricted_cookie_manager_qt.h"
 #include "net/proxying_url_loader_factory_qt.h"
 #include "net/system_network_context_manager.h"
-#include "ozone/gl_share_context_qt.h"
 #include "platform_notification_service_qt.h"
 #include "profile_qt.h"
 #include "profile_io_data_qt.h"
@@ -87,11 +86,6 @@
 #include "api/qwebenginecookiestore_p.h"
 #include "api/qwebengineurlrequestinfo_p.h"
 
-#if QT_CONFIG(opengl)
-#include <QOpenGLContext>
-#include <QOpenGLExtraFunctions>
-#endif
-
 #if QT_CONFIG(webengine_geolocation)
 #include "base/memory/ptr_util.h"
 #include "location_provider_qt.h"
@@ -154,11 +148,6 @@
 
 #include <QGuiApplication>
 #include <QStandardPaths>
-#include <qpa/qplatformnativeinterface.h>
-
-QT_BEGIN_NAMESPACE
-Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
-QT_END_NAMESPACE
 
 // Implement IsHandledProtocol as declared in //url/url_util_qt.h.
 namespace url {
@@ -248,13 +237,6 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost
     renderer_configuration->SetInitialConfiguration(is_incognito_process);
 }
 
-gl::GLShareGroup *ContentBrowserClientQt::GetInProcessGpuShareGroup()
-{
-    if (!m_shareGroupQt.get())
-        m_shareGroupQt = new ShareGroupQt;
-    return m_shareGroupQt.get();
-}
-
 content::MediaObserver *ContentBrowserClientQt::GetMediaObserver()
 {
     return MediaCaptureDevicesDispatcher::GetInstance();
@@ -846,12 +828,12 @@ std::vector<std::unique_ptr<content::NavigationThrottle>> ContentBrowserClientQt
                             base::BindRepeating(&navigationThrottleCallback),
                             navigation_interception::SynchronyMode::kSync));
 
-#if BUILDFLAG(ENABLE_PDF)
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-    MaybeAddThrottle(extensions::PDFIFrameNavigationThrottleQt::MaybeCreateThrottleFor(navigation_handle), &throttles);
-#endif // BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_PDF) && BUILDFLAG(ENABLE_EXTENSIONS)
+    MaybeAddThrottle(
+            extensions::PDFIFrameNavigationThrottleQt::MaybeCreateThrottleFor(navigation_handle),
+            &throttles);
     MaybeAddThrottle(pdf::PdfNavigationThrottle::MaybeCreateThrottleFor(navigation_handle, std::make_unique<PdfStreamDelegateQt>()), &throttles);
-#endif // BUILDFLAG(ENABLE_PDF)
+#endif // BUILDFLAG(ENABLE_PDF) && BUIDLFLAG(ENABLE_EXTENSIONS)
 
     return throttles;
 }
@@ -1222,7 +1204,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati
                                        const scoped_refptr<network::SharedURLLoaderFactory>& network_loader_factory)
 {
     std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>> interceptors;
-#if BUILDFLAG(ENABLE_PDF)
+#if BUILDFLAG(ENABLE_PDF) && BUILDFLAG(ENABLE_EXTENSIONS)
     {
         std::unique_ptr<content::URLLoaderRequestInterceptor> pdf_interceptor =
                 pdf::PdfURLLoaderRequestInterceptor::MaybeCreateInterceptor(
@@ -1230,7 +1212,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati
         if (pdf_interceptor)
             interceptors.push_back(std::move(pdf_interceptor));
     }
-#endif
+#endif // BUILDFLAG(ENABLE_PDF) && BUIDLFLAG(ENABLE_EXTENSIONS)
 
     return interceptors;
 }
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 4ee5c0228..ded346a34 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -28,14 +28,9 @@ namespace device {
 class GeolocationManager;
 } // namespace device
 
-namespace gl {
-class GLShareGroup;
-}
-
 namespace QtWebEngineCore {
 
 class BrowserMainPartsQt;
-class ShareGroupQt;
 
 class ContentBrowserClientQt : public content::ContentBrowserClient
 {
@@ -44,7 +39,6 @@ public:
     ~ContentBrowserClientQt();
     std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(content::MainFunctionParams) override;
     void RenderProcessWillLaunch(content::RenderProcessHost *host) override;
-    gl::GLShareGroup* GetInProcessGpuShareGroup() override;
     content::MediaObserver* GetMediaObserver() override;
     scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext() override;
     void OverrideWebkitPrefs(content::WebContents *web_contents,
@@ -240,7 +234,6 @@ public:
     std::string GetProduct() override;
 
 private:
-    scoped_refptr<ShareGroupQt> m_shareGroupQt;
     BrowserMainPartsQt *m_browserMainParts = nullptr;
 };
 
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 92a00a5c8..67faabde8 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -296,7 +296,7 @@ static bool IsWidevineAvailable(base::FilePath *cdm_path,
 #endif
     }
 
-    for (const QString &pluginPath : qAsConst(pluginPaths)) {
+    for (const QString &pluginPath : std::as_const(pluginPaths)) {
         *cdm_path = QtWebEngineCore::toFilePath(pluginPath);
         if (base::PathExists(*cdm_path)) {
             // Add the supported codecs as if they came from the component manifest.
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
index 47210aa09..898b8a1cc 100644
--- a/src/core/desktop_screen_qt.cpp
+++ b/src/core/desktop_screen_qt.cpp
@@ -69,7 +69,7 @@ DesktopScreenQt::DesktopScreenQt()
 
 DesktopScreenQt::~DesktopScreenQt()
 {
-    for (auto conn : qAsConst(m_connections))
+    for (auto conn : std::as_const(m_connections))
         QObject::disconnect(conn);
 }
 
diff --git a/src/core/doc/qtwebengine.qdocconf b/src/core/doc/qtwebengine.qdocconf
index ed95ae0ca..5cbe9e500 100644
--- a/src/core/doc/qtwebengine.qdocconf
+++ b/src/core/doc/qtwebengine.qdocconf
@@ -45,7 +45,6 @@ depends += qtcore \
            qtcore5compat \
            qtdesigner \
            qtgui \
-           qtlocation \
            qtnetwork \
            qtprintsupport \
            qtpositioning \
diff --git a/src/core/doc/src/qtwebengine-features.qdoc b/src/core/doc/src/qtwebengine-features.qdoc
index dc38f5069..a564641a5 100644
--- a/src/core/doc/src/qtwebengine-features.qdoc
+++ b/src/core/doc/src/qtwebengine-features.qdoc
@@ -15,10 +15,14 @@
         \li \l{Client Certificates}
         \li \l{Custom Schemes}
         \li \l{Drag and Drop}
+        \li \l{Favicon}
         \li \l{Fullscreen}
+        \li \l{Hardware Acceleration}
         \li \l{HTML5 DRM}
         \li \l{HTML5 Geolocation}
+        \li \l{HTML5 WebSockets}
         \li \l{HTTP/2 Protocol}
+        \li \l{Local Storage}
         \li \l{Native Dialogs}
         \li \l{Pepper Plugin API}
         \li \l{PDF File Viewing}
@@ -28,9 +32,9 @@
         \li \l{Spellchecker}
         \li \l{Touch}
         \li \l{View Source}
-        \li \l{webrtc_feature}{WebRTC}
         \li \l{Web Notifications}
-        \li \l{Favicon Handling}
+        \li \l{WebGL}
+        \li \l{webrtc_feature}{WebRTC}
     \endlist
 
     \section1 Audio and Video Codecs
@@ -121,6 +125,16 @@
     recommended to always give the user a choice before uniquely identifying them
     to a remote server.
 
+    In addition to the client certificate stored in system settings, \QWE offers also
+    the in-memory store. The QWebEngineClientCertificateStore instance can be obtained with
+    the QWebEngineProfile::clientCertificateStore() method. An application can use this
+    class to add a new certificate with a QWebEngineClientCertificateStore::add() call.
+    Note that during the \c selectClientCertificate calls, \QWE lists both system
+    and in-memory stored clients certificates.
+
+    See also \l{WebEngine Widgets Client Certificate Example}{Client Certificate Example}
+    for more implementation details.
+
     \section1 Custom Schemes
 
     \QWE makes it possible for the application to define its own custom
@@ -128,7 +142,7 @@
 
     Custom schemes can be used to implement alternative network protocols with
     all the usual web security policies, privileged internal schemes for
-    displaying user interface compoments or debugging information, sandboxed
+    displaying user interface components or debugging information, sandboxed
     schemes with extra restrictions, and so on.
 
     For more information, see \l QWebEngineUrlScheme and \l
@@ -149,6 +163,61 @@
 
     Support for this feature was added in Qt 5.7.0.
 
+    \section1 Favicon
+
+    \QWE supports the web site URL icon, \e favicon. Each icon is stored in the internal
+    database for each \l QWebEngineProfile and can be accessed using a \l QWebEnginePage::icon()
+    call or a \l {WebEngineView::icon}{WebEngineView.icon} property for the currently loaded content.
+
+    Moreover \QWE provides API for accessing already stored icons in the internal profile's database.
+
+    \note The icon database is not available for off-the-record profiles.
+
+    \section2 QML Favicon Handling
+
+    For accessing icons a \c QQuickImageProvider is registered. This provider can be
+    accessed by a special URL where the scheme is "image:" and the host is "favicon".
+
+    \qml
+    Image {
+        source: "image://favicon/url"
+    }
+    \endqml
+
+    The \c url can be the URL of the favicon:
+
+    \qml
+    Image {
+        source: "image://favicon/https://www.qt.io/hubfs/2016_Qt_Logo/qt_logo_green_rgb_16x16.png"
+    }
+    \endqml
+
+    The \c url also can be a page URL to access its icon:
+
+    \qml
+    Image {
+        source: "image://favicon/https://www.qt.io/"
+    }
+    \endqml
+
+    If more than one icon is available, the \l {Image::sourceSize} property can be
+    specified to choose the icon with the desired size. If \l {Image::sourceSize}
+    is not specified or 0, the largest available icon will be chosen.
+
+    The image provider looks up the requested icon in the existing \l {WebEngineView}
+    instances. First, it tries to match the currently displayed icons. If no match
+    has been found it requests the icon from the database. Each profile has its
+    own icon database and it is stored in the persistent storage thus the stored icons
+    can be accessed without network connection too. The icon must be previously loaded
+    to be stored in the database.
+
+    \section2 C++ Favicon Handling
+
+    A user can request an icon from the previously loaded content for each
+    \l QWebEngineProfile using the \l QWebEngineProfile::requestIconForPageURL() or
+    \l QWebEngineProfile::requestIconForIconURL() calls. Note that the profile's database is
+    stored in the persistent storage and can be accessed without a network connection.
+
     \section1 Fullscreen
 
     \QWE supports viewing web content in fullscreen mode. For more
@@ -165,6 +234,20 @@
 
     Support for this feature was added in Qt 5.6.0.
 
+    \section1 Hardware Acceleration
+
+    QtWebEngine tries to use hardware acceleration for rendering the content. It uses
+    \c OpenGL or \c OpenGLES APIs to execute rendering calls on the GPU. As a fallback,
+    software rendering is used whenever the hardware does not meet the required set of
+    OpenGL functionality. A user can check the current hardware acceleration state by
+    loading the \c {chrome://gpu} internal page. Moreover, the acceleration can be explicitly
+    disabled with \c {QTWEBENGINE_CHROMIUM_FLAGS} using the \c {disable-gpu} switch.
+    For example on Linux:
+
+    \badcode
+    export QTWEBENGINE_CHROMIUM_FLAGS=--disable-gpu
+    \endcode
+
     \section1 HTML5 DRM
 
     \QWE supports viewing DRM protected videos if the \l{Widevine CDM} plugin has been installed.
@@ -205,18 +288,35 @@
     \section1 HTML5 Geolocation
 
     \QWE supports JavaScript Geolocation API with \l {Qt Positioning} as a
-    backend. The application has to explicitly allow the feature by using
-    QWebEnginePage::Geolocation or \l{WebEngineView::Feature}
-    {WebEngineView.Feature}.
+    backend. HTML5 geolocation is disabled by default. To explicitly allow it, the application
+    needs to listen to QWebEnginePage::featurePermissionRequested. Use QWebEnginePage::Geolocation
+    with a QWebEnginePage::setFeaturePermission() call or \l{WebEngineView::Feature}
+    with a \l{WebEngineView::grantFeaturePermission} {WebEngineView.grantFeaturePermission}() call
+    to grant the required permission.
 
-    If Qt Positioning has been built before \QWE then this feature can be
+    If \QWE was built with Qt Positioning support then this feature can be
     tested by using \l{WebEngine Widgets Maps Example}{Maps} and allowing it to
-    find the current position of the user. Note that on Windows an external GPS
-    receiver must be connected to the application. For more information, see
-    \l{Qt Positioning}.
+    find the current position of the user.
+
+    See \l{Qt Positioning} for a possible backend setup like the GPS or IP based positioning.
 
     Support for this feature was added in Qt 5.5.0.
 
+    \section1 HTML5 WebSockets
+
+    \QWE supports the WebSocket JavaScript API to communicate with WebSocket servers
+    using the \c {ws://} or \c {wss://} protocols. Moreover, integration with Qt WebChannel
+    and Qt WebSockets enables communication between JavaScript and the native side of
+    the application.
+
+    The Qt WebChannel module has a great example for a
+    \l[QtWebChannel]{Qt WebChannel ChatServer Example}{chat server}
+    and its web based
+    \l[QtWebChannel]{Qt WebChannel ChatClient HTML Example}{chat client}.
+    The client works out of the box in the example browsers of \QWE
+    (such as \l{WebEngine Widgets Simple Browser Example}
+    {Simple Browser} or \l{WebEngine Quick Nano Browser}{Nano Browser}).
+
     \section1 HTTP/2 Protocol
 
     \QWE supports the Chromium implementation of the \l{HTTP/2}
@@ -226,6 +326,31 @@
     \l{Akamai HTTP/2 Demo}, in \l{WebEngine Widgets Simple Browser Example}
     {Simple Browser} or \l{WebEngine Quick Nano Browser}{Nano Browser}.
 
+    \section1 Local Storage
+
+    \QWE supports saving key-value pairs in a \c {Local Storage} with no expiration date.
+    This is a part of the \l
+    {https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API}
+    {Web Storage API}, where a user can access a \c Storage object for the given domains
+    using the \c Window.localStorage JavaScript property. The stored data will persist even
+    after the page or the browser application is closed.
+
+    Note that the \c Local Storage can be also disabled with a
+    \l QWebEngineSettings::LocalStorageEnabled
+    setting. Moreover, the storage path can be adjusted with a
+    \l QWebEngineProfile::setPersistentStoragePath
+    call.
+
+    \code
+     QWebEngineProfile profile("MyProfile");
+     profile.settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, isEnabled);
+     profile.setPersistentStoragePath("/path/to/storage");
+    \endcode
+
+    \QWE offers also an easy way of investigating the content of the \c {Local Storage}
+    with \l {Qt WebEngine Developer Tools} by visiting the \uicontrol Application panel
+    and expanding the \uicontrol {Local Storage} menu.
+
     \section1 Native Dialogs
 
     A web page might request dialogs for the following functions:
@@ -516,6 +641,15 @@
     This feature can be tested by building and running the
     \l{WebEngine Widgets Spellchecker Example}{Spellchecker Example}.
 
+    \QWE can be compiled also without spellchecker support with the use of
+    a \c {webengine-spellchecker} configure switch.
+
+    \badcode
+    qt-configure-module path\to\qtwebengine\sources -no-webengine-spellchecker
+    \endcode
+
+    For more information, see \l{Qt Configure Options}.
+
     Support for this feature was added in Qt 5.8.0.
 
     \section1 Touch
@@ -562,17 +696,6 @@
 
     Support for this feature was added in Qt 5.8.0.
 
-    \target webrtc_feature
-    \section1 WebRTC
-
-    WebRTC provides browsers with Real-Time Communications (RTC) capabilities
-    via simple APIs. For more information, see \l{WebEngineView::Feature}
-    {WebEngineView.Feature} and QWebEnginePage::Feature.
-
-    This feature can be tested by setting up a webcam or microphone and then
-    opening \c https://test.webrtc.org/ in \l{WebEngine Widgets Simple Browser
-    Example}{Simple Browser} or \l{WebEngine Quick Nano Browser}{Nano Browser}.
-
     \section1 Web Notifications
 
     Qt WebEngine supports JavaScript \l{Web Notifications API}.
@@ -582,41 +705,25 @@
 
     Support for this feature was added in Qt 5.13.0.
 
-    \section1 Favicon Handling
+    \section1 WebGL
 
-    For accessing icons a \c QQuickImageProvider is registered. This provider can be
-    accessed by a special URL where the scheme is "image:" and the host is "favicon".
-    For example,
-    \qml
-    Image {
-        source: "image://favicon/url"
-    }
-    \endqml
+    \QWE supports WebGL for some graphics stacks setups. A user can visit the
+    chrome://gpu page using the QtWebEngine powered application. The \e {Graphics Feature Status}
+    overview states if WebGL is supported for the current platform setup. A user can also
+    check the \l {https://webglreport.com}{WebGL Report}.
 
-    The \c url can be  the URL of the favicon. For example,
-    \qml
-    Image {
-        source: "image://favicon/https://www.qt.io/hubfs/2016_Qt_Logo/qt_logo_green_rgb_16x16.png"
-    }
-    \endqml
+    The WebGL support is enabled by default. You can disable it with the
+    \l QWebEngineSettings::WebGLEnabled setting.
 
-    The \c url also can be a page URL to access its icon. For example,
-    \qml
-    Image {
-        source: "image://favicon/https://www.qt.io/"
-    }
-    \endqml
+    \target webrtc_feature
+    \section1 WebRTC
 
-    If more than one icon is available, the \l {Image::sourceSize} property can be
-    specified to choose the icon with the desired size. If \l {Image::sourceSize}
-    is not specified or 0, the largest available icon will be chosen.
+    WebRTC provides browsers with Real-Time Communications (RTC) capabilities
+    via simple APIs. For more information, see \l{WebEngineView::Feature}
+    {WebEngineView.Feature}, and QWebEnginePage::Feature.
 
-    The image provider looks up the requested icon in the existing \l {WebEngineView}
-    instances. First, it tries to match the currently displayed icons. If no match
-    has been found it requests the icon from the database. Each profile has its
-    own icon database and it is stored in the persistent storage thus the stored icons
-    can be accessed without network connection too. The icon must be previously loaded
-    to be stored in the database.
+    This feature can be tested by setting up a webcam or microphone and then
+    opening \c https://test.webrtc.org/ in \l{WebEngine Widgets Simple Browser
+    Example}{Simple Browser} or \l{WebEngine Quick Nano Browser}{Nano Browser}.
 
-    \note The icon database is not available for off-the-record profiles.
 */
diff --git a/src/core/doc/src/qtwebengine-overview.qdoc b/src/core/doc/src/qtwebengine-overview.qdoc
index 3937ca9bb..2e1272404 100644
--- a/src/core/doc/src/qtwebengine-overview.qdoc
+++ b/src/core/doc/src/qtwebengine-overview.qdoc
@@ -58,6 +58,9 @@
 
     The \QWE core is based on the \l {Chromium Project}. Chromium provides its own network
     and painting engines and is developed tightly together with its dependent modules.
+    Even though the QtNetwork stack is not used, its setup can be synchronized with the \QWE.
+    See \l {Proxy Support}, \l {Managing Certificates}, \l {Client Certificates}, and
+    \l {QWebEngineCookieStore} for more details.
 
     \note \QWE is based on Chromium, but does not contain or use any services
     or add-ons that might be part of the Chrome browser that is built and delivered by Google.
@@ -65,10 +68,19 @@
     \l{https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md}{overview}
     that is part of the documentation in the \l {Chromium Project} upstream source tree.
 
-    This version of \QWE is based on Chromium version 94.0.4606, with additional security
-    fixes from newer versions. The Chromium version can also be read at runtime using the
+    The Chromium version used is the one used by the latest stable Chrome version at the time of Qt feature freeze
+    for the current version of \QWE. Additional security patches are cherry picked from newer Chrome releases on
+    every patch release, security patches released in time for the Qt patch release freeze will be included.
+    If Chrome releases critical fixes outside our release window, the next patch release is sped up to ensure a
+    patched \QWE is released before the patch details goes public.
+
+    If you need a newer \QWE beyond security fixes, and can not update all of Qt, \QWE supports building with
+    older version of Qt back to the last Qt LTS. For instance \QWE 6.3, 6.4, and 6.5 can all be built with Qt 6.2.
+    In Qt LTS releases, \QWE may be fully replaced with such a newer version to make security patching easier.
+
+    The relevant Chromium versions in question can also be read at runtime using the
     \l qWebEngineChromiumVersion() method, and \l qWebEngineChromiumSecurityPatchVersion()
-    to read the current patch level. You can also find the versions in the QtWebEngine
+    to read the current security patch level. You can also find the versions in the \QWE
     sources in the CHROMIUM_VERSION file.
 
     \section2 Qt WebEngine Process
@@ -204,7 +216,7 @@
     open SSL connections. Instead, \QWE uses the root CA certificates from the operating
     system to validate the peer's certificate.
 
-    The \l{WebEngineCertificateError::error} and \l{QWebEngineCertificateError::Type} enumerations
+    The \l{WebEngineCertificateError::type} and \l{QWebEngineCertificateError::Type} enumerations
     provide information about the types of certificate errors that might occur. The errors can be
     handled by using the WebEngineView::certificateError QML method or by connecting to the
     QWebEnginePage::certificateError signal.
diff --git a/src/core/doc/src/qtwebenginecore-index.qdoc b/src/core/doc/src/qtwebenginecore-index.qdoc
index cd6f2efe4..e6fc0b307 100644
--- a/src/core/doc/src/qtwebenginecore-index.qdoc
+++ b/src/core/doc/src/qtwebenginecore-index.qdoc
@@ -7,7 +7,8 @@
 
     \brief Provides common API shared by \QWE Quick and \QWE Widgets.
 
-    \QWE Core provides API shared by \l {Qt WebEngine Quick} and \l {Qt WebEngine Widgets}.
+    \QWE Core provides API shared by \l {Qt WebEngine QML Types}{Qt WebEngine Quick} and
+    \l {Qt WebEngine Widgets C++ Classes}{Qt WebEngine Widgets}.
 
     \section1 Getting Started
 
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp
index 65884c9b6..d093c4e26 100644
--- a/src/core/download_manager_delegate_qt.cpp
+++ b/src/core/download_manager_delegate_qt.cpp
@@ -157,7 +157,7 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem *
             item->GetStartTime().ToTimeT()
         };
 
-        for (ProfileAdapterClient *client : qAsConst(clients)) {
+        for (ProfileAdapterClient *client : std::as_const(clients)) {
             client->downloadRequested(info);
             if (info.accepted)
                 break;
@@ -254,7 +254,7 @@ void DownloadManagerDelegateQt::ChooseSavePath(content::WebContents *web_content
         ++m_currentId,
         toQt(web_contents->GetURL()),
         download::DownloadItem::IN_PROGRESS,
-        0, /* totalBytes */
+        -1, /* totalBytes */
         0, /* receivedBytes */
         QStringLiteral("application/x-mimearchive"),
         suggestedFilePath,
@@ -269,7 +269,7 @@ void DownloadManagerDelegateQt::ChooseSavePath(content::WebContents *web_content
         QDateTime::currentMSecsSinceEpoch()
     };
 
-    for (ProfileAdapterClient *client : qAsConst(clients)) {
+    for (ProfileAdapterClient *client : std::as_const(clients)) {
         client->downloadRequested(info);
         if (info.accepted)
             break;
@@ -317,7 +317,7 @@ void DownloadManagerDelegateQt::OnDownloadUpdated(download::DownloadItem *downlo
             download->GetStartTime().ToTimeT()
         };
 
-        for (ProfileAdapterClient *client : qAsConst(clients)) {
+        for (ProfileAdapterClient *client : std::as_const(clients)) {
             client->downloadUpdated(info);
         }
     }
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp
index 4d8b185df..1bfa0db20 100644
--- a/src/core/file_picker_controller.cpp
+++ b/src/core/file_picker_controller.cpp
@@ -187,7 +187,7 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
         }
 
         std::vector<blink::mojom::FileChooserFileInfoPtr> chooser_files;
-        for (const auto &file : qAsConst(files)) {
+        for (const auto &file : std::as_const(files)) {
             chooser_files.push_back(blink::mojom::FileChooserFileInfo::NewNativeFile(
                     blink::mojom::NativeFileInfo::New(toFilePath(file), std::u16string())));
         }
@@ -198,9 +198,13 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
             d_ptr->fileDialogListener->FileSelected(
                     std::move(chooser_files), baseDir,
                     static_cast<blink::mojom::FileChooserParams::Mode>(d_ptr->mode));
+
+        // release the fileSelectListener manually because it blocks fullscreen requests in chromium
+        // see QTBUG-106975
+        d_ptr->fileDialogListener.reset();
     } else if (d_ptr->fileSystemAccessDialogListener) {
         std::vector<base::FilePath> files;
-        for (const auto &file : qAsConst(filesList)) {
+        for (const auto &file : std::as_const(filesList)) {
             files.push_back(toFilePath(file));
         }
 
@@ -209,10 +213,6 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
         else
             d_ptr->fileSystemAccessDialogListener->MultiFilesSelected(files, nullptr);
     }
-
-    // release the fileSelectListener manually because it blocks fullscreen requests in chromium
-    // see QTBUG-106975
-    d_ptr->fileDialogListener.reset();
 }
 
 QStringList FilePickerController::acceptedMimeTypes() const
diff --git a/src/core/file_system_access/file_system_access_permission_context_qt.cpp b/src/core/file_system_access/file_system_access_permission_context_qt.cpp
index 3a9c80288..11a50e1c7 100644
--- a/src/core/file_system_access/file_system_access_permission_context_qt.cpp
+++ b/src/core/file_system_access/file_system_access_permission_context_qt.cpp
@@ -204,8 +204,6 @@ FileSystemAccessPermissionContextQt::GetReadPermissionGrant(const url::Origin &o
                                                             HandleType handle_type,
                                                             UserAction user_action)
 {
-    Q_UNUSED(user_action);
-
     auto &origin_state = m_origins[origin];
     auto *&existing_grant = origin_state.read_grants[path];
     scoped_refptr<FileSystemAccessPermissionGrantQt> new_grant;
@@ -224,6 +222,27 @@ FileSystemAccessPermissionContextQt::GetReadPermissionGrant(const url::Origin &o
         existing_grant = new_grant.get();
     }
 
+    // If a parent directory is already readable this new grant should also be readable.
+    if (new_grant && AncestorHasActivePermission(origin, path, GrantType::kRead)) {
+        existing_grant->SetStatus(blink::mojom::PermissionStatus::GRANTED);
+        return existing_grant;
+    }
+
+    switch (user_action) {
+    case UserAction::kOpen:
+    case UserAction::kSave:
+        // Open and Save dialog only grant read access for individual files.
+        if (handle_type == HandleType::kDirectory)
+            break;
+        Q_FALLTHROUGH();
+    case UserAction::kDragAndDrop:
+        // Drag&drop grants read access for all handles.
+        existing_grant->SetStatus(blink::mojom::PermissionStatus::GRANTED);
+        break;
+    case UserAction::kLoadFromStorage:
+        break;
+    }
+
     return existing_grant;
 }
 
@@ -233,8 +252,6 @@ FileSystemAccessPermissionContextQt::GetWritePermissionGrant(const url::Origin &
                                                              HandleType handle_type,
                                                              UserAction user_action)
 {
-    Q_UNUSED(user_action);
-
     auto &origin_state = m_origins[origin];
     auto *&existing_grant = origin_state.write_grants[path];
     scoped_refptr<FileSystemAccessPermissionGrantQt> new_grant;
@@ -253,6 +270,23 @@ FileSystemAccessPermissionContextQt::GetWritePermissionGrant(const url::Origin &
         existing_grant = new_grant.get();
     }
 
+    // If a parent directory is already writable this new grant should also be writable.
+    if (new_grant && AncestorHasActivePermission(origin, path, GrantType::kWrite)) {
+        existing_grant->SetStatus(blink::mojom::PermissionStatus::GRANTED);
+        return existing_grant;
+    }
+
+    switch (user_action) {
+    case UserAction::kSave:
+        // Only automatically grant write access for save dialogs.
+        existing_grant->SetStatus(blink::mojom::PermissionStatus::GRANTED);
+        break;
+    case UserAction::kOpen:
+    case UserAction::kDragAndDrop:
+    case UserAction::kLoadFromStorage:
+        break;
+    }
+
     return existing_grant;
 }
 
@@ -392,4 +426,42 @@ void FileSystemAccessPermissionContextQt::DidConfirmSensitiveDirectoryAccess(
         std::move(callback).Run(SensitiveDirectoryResult::kAllowed);
 }
 
+bool FileSystemAccessPermissionContextQt::AncestorHasActivePermission(
+    const url::Origin &origin, const base::FilePath &path, GrantType grant_type) const
+{
+    auto it = m_origins.find(origin);
+    if (it == m_origins.end())
+        return false;
+
+    const auto &relevant_grants = grant_type == GrantType::kWrite ? it->second.write_grants : it->second.read_grants;
+    if (relevant_grants.empty())
+        return false;
+
+    // Permissions are inherited from the closest ancestor.
+    for (base::FilePath parent = path.DirName(); parent != parent.DirName(); parent = parent.DirName()) {
+        auto i = relevant_grants.find(parent);
+        if (i != relevant_grants.end() && i->second && i->second->GetStatus() == blink::mojom::PermissionStatus::GRANTED)
+            return true;
+    }
+    return false;
+}
+
+void FileSystemAccessPermissionContextQt::PermissionGrantDestroyed(
+        FileSystemAccessPermissionGrantQt *grant)
+{
+    auto it = m_origins.find(grant->origin());
+    if (it == m_origins.end())
+        return;
+
+    auto &grants =
+            grant->type() == GrantType::kRead ? it->second.read_grants : it->second.write_grants;
+    auto grant_it = grants.find(grant->path());
+
+    if (grant_it == grants.end()) {
+        return;
+    }
+    if (grant_it->second == grant)
+        grants.erase(grant_it);
+}
+
 } // namespace QtWebEngineCore
diff --git a/src/core/file_system_access/file_system_access_permission_context_qt.h b/src/core/file_system_access/file_system_access_permission_context_qt.h
index 722e44d14..1e2843ce7 100644
--- a/src/core/file_system_access/file_system_access_permission_context_qt.h
+++ b/src/core/file_system_access/file_system_access_permission_context_qt.h
@@ -19,7 +19,7 @@ class BrowserContext;
 }
 
 namespace QtWebEngineCore {
-
+class FileSystemAccessPermissionGrantQt;
 class FileSystemAccessPermissionContextQt : public content::FileSystemAccessPermissionContext,
                                             public KeyedService
 {
@@ -54,6 +54,8 @@ public:
     void NavigatedAwayFromOrigin(const url::Origin &origin);
     content::BrowserContext *profile() const { return m_profile; }
 
+    void PermissionGrantDestroyed(FileSystemAccessPermissionGrantQt *);
+
 private:
     class PermissionGrantImpl;
 
@@ -61,6 +63,9 @@ private:
             const url::Origin &origin, const base::FilePath &path, HandleType handle_type,
             content::GlobalRenderFrameHostId frame_id,
             base::OnceCallback<void(SensitiveDirectoryResult)> callback, bool should_block);
+    bool AncestorHasActivePermission(const url::Origin &origin,
+                                     const base::FilePath &path,
+                                     GrantType grant_type) const;
 
     content::BrowserContext *m_profile;
 
diff --git a/src/core/file_system_access/file_system_access_permission_grant_qt.cpp b/src/core/file_system_access/file_system_access_permission_grant_qt.cpp
index 27f225755..b9a8f5a26 100644
--- a/src/core/file_system_access/file_system_access_permission_grant_qt.cpp
+++ b/src/core/file_system_access/file_system_access_permission_grant_qt.cpp
@@ -22,7 +22,11 @@ FileSystemAccessPermissionGrantQt::FileSystemAccessPermissionGrantQt(
     : m_context(context), m_origin(origin), m_path(path), m_handleType(handle_type), m_type(type)
 {
 }
-
+FileSystemAccessPermissionGrantQt::~FileSystemAccessPermissionGrantQt()
+{
+    if (m_context)
+        m_context->PermissionGrantDestroyed(this);
+}
 void FileSystemAccessPermissionGrantQt::RequestPermission(
         content::GlobalRenderFrameHostId frame_id, UserActivationState user_activation_state,
         base::OnceCallback<void(PermissionRequestOutcome)> callback)
diff --git a/src/core/file_system_access/file_system_access_permission_grant_qt.h b/src/core/file_system_access/file_system_access_permission_grant_qt.h
index a54b2a3d3..e1d1ca7e9 100644
--- a/src/core/file_system_access/file_system_access_permission_grant_qt.h
+++ b/src/core/file_system_access/file_system_access_permission_grant_qt.h
@@ -38,6 +38,9 @@ public:
 
     void SetStatus(PermissionStatus status);
 
+protected:
+    ~FileSystemAccessPermissionGrantQt() override;
+
 private:
     void OnPermissionRequestResult(base::OnceCallback<void(PermissionRequestOutcome)> callback,
                                    PermissionAction result);
diff --git a/src/core/file_system_access/file_system_access_permission_request_controller_impl.cpp b/src/core/file_system_access/file_system_access_permission_request_controller_impl.cpp
index 7dc5f5211..f77c974d0 100644
--- a/src/core/file_system_access/file_system_access_permission_request_controller_impl.cpp
+++ b/src/core/file_system_access/file_system_access_permission_request_controller_impl.cpp
@@ -23,7 +23,7 @@ FileSystemAccessPermissionRequestControllerImpl::FileSystemAccessPermissionReque
         const FileSystemAccessPermissionRequestManagerQt::RequestData &request,
         base::OnceCallback<void(permissions::PermissionAction result)> callback)
     : FileSystemAccessPermissionRequestController(
-            toQt(request.origin.GetURL()), toQt(request.path.value()),
+            toQt(request.origin.GetURL()), QUrl::fromLocalFile(toQt(request.path.value())),
             (HandleType)request.handle_type, AccessFlags((int)request.access))
     , m_callback(std::move(callback))
 {
diff --git a/src/core/net/client_cert_override.cpp b/src/core/net/client_cert_qt.cpp
index 9a8cca839..1e7aa8b6a 100644
--- a/src/core/net/client_cert_override.cpp
+++ b/src/core/net/client_cert_qt.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 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 "client_cert_override.h"
+#include "client_cert_qt.h"
 
 #include "base/bind.h"
 #include "base/task/post_task.h"
@@ -35,12 +35,12 @@
 
 namespace {
 
-class ClientCertIdentityOverride : public net::ClientCertIdentity
+class ClientCertIdentityQt : public net::ClientCertIdentity
 {
 public:
-    ClientCertIdentityOverride(scoped_refptr<net::X509Certificate> cert, scoped_refptr<net::SSLPrivateKey> key)
+    ClientCertIdentityQt(scoped_refptr<net::X509Certificate> cert, scoped_refptr<net::SSLPrivateKey> key)
             : net::ClientCertIdentity(std::move(cert)), m_key(std::move(key)) {}
-    ~ClientCertIdentityOverride() override = default;
+    ~ClientCertIdentityQt() override = default;
 
     void AcquirePrivateKey(base::OnceCallback<void(scoped_refptr<net::SSLPrivateKey>)> private_key_callback) override
     {
@@ -55,55 +55,74 @@ private:
 
 namespace QtWebEngineCore {
 
-ClientCertOverrideStore::ClientCertOverrideStore(ClientCertificateStoreData *storeData)
+ClientCertStoreQt::ClientCertStoreQt(ClientCertificateStoreData *storeData)
     : ClientCertStore()
     , m_storeData(storeData)
     , m_nativeStore(createNativeStore())
 {
 }
 
-ClientCertOverrideStore::~ClientCertOverrideStore() = default;
+ClientCertStoreQt::~ClientCertStoreQt() = default;
 
 #if QT_CONFIG(ssl)
-net::ClientCertIdentityList ClientCertOverrideStore::GetClientCertsOnUIThread(const net::SSLCertRequestInfo &cert_request_info)
+net::ClientCertIdentityList ClientCertStoreQt::GetClientCertsOnUIThread(const net::SSLCertRequestInfo &cert_request_info)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     const auto &clientCertOverrideData = m_storeData->extraCerts;
+
     // Look for certificates in memory store
+    net::ClientCertIdentityList selected_identities;
     for (int i = 0; i < clientCertOverrideData.length(); i++) {
         scoped_refptr<net::X509Certificate> cert = clientCertOverrideData[i]->certPtr;
-        if (cert != NULL && cert->IsIssuedByEncoded(cert_request_info.cert_authorities)) {
-            net::ClientCertIdentityList selected_identities;
-            selected_identities.push_back(std::make_unique<ClientCertIdentityOverride>(cert, clientCertOverrideData[i]->keyPtr));
-            return selected_identities;
+        if (cert) {
+            if (cert->HasExpired()) {
+                qWarning() << "Expired certificate" << clientCertOverrideData[i];
+                continue;
+            }
+            if (cert_request_info.cert_authorities.empty()
+                || cert->IsIssuedByEncoded(cert_request_info.cert_authorities)) {
+                selected_identities.push_back(std::make_unique<ClientCertIdentityQt>(
+                        cert, clientCertOverrideData[i]->keyPtr));
+            }
         }
     }
-    return net::ClientCertIdentityList();
+    return selected_identities;
 }
 
-void ClientCertOverrideStore::GetClientCertsReturn(const net::SSLCertRequestInfo &cert_request_info,
+void ClientCertStoreQt::GetClientCertsReturn(const net::SSLCertRequestInfo &cert_request_info,
                                                    ClientCertListCallback callback,
                                                    net::ClientCertIdentityList &&result)
 {
-    // Continue with native cert store if matching certificatse were not found in memory
-    if (result.empty() && m_nativeStore)
-        m_nativeStore->GetClientCerts(cert_request_info, std::move(callback));
-    else
+    // Continue with native cert store and append them after memory certificates
+    if (m_nativeStore) {
+        ClientCertListCallback callback2 = base::BindOnce(
+                [](ClientCertStoreQt::ClientCertListCallback callback,
+                   net::ClientCertIdentityList result1, net::ClientCertIdentityList result2) {
+                    while (!result2.empty()) {
+                        result1.push_back(std::move(result2.back()));
+                        result2.pop_back();
+                    }
+                    std::move(callback).Run(std::move(result1));
+                },
+                std::move(callback), std::move(result));
+        m_nativeStore->GetClientCerts(cert_request_info, std::move(callback2));
+    } else {
         std::move(callback).Run(std::move(result));
+    }
 }
 
 #endif // QT_CONFIG(ssl)
 
-void ClientCertOverrideStore::GetClientCerts(const net::SSLCertRequestInfo &cert_request_info,
+void ClientCertStoreQt::GetClientCerts(const net::SSLCertRequestInfo &cert_request_info,
                                              ClientCertListCallback callback)
 {
 #if QT_CONFIG(ssl)
     // Access the user-provided data from the UI thread, but return on whatever thread this is.
     bool ok = base::PostTaskAndReplyWithResult(
             FROM_HERE, { content::BrowserThread::UI },
-            base::BindOnce(&ClientCertOverrideStore::GetClientCertsOnUIThread,
+            base::BindOnce(&ClientCertStoreQt::GetClientCertsOnUIThread,
                            base::Unretained(this), std::cref(cert_request_info)),
-            base::BindOnce(&ClientCertOverrideStore::GetClientCertsReturn,
+            base::BindOnce(&ClientCertStoreQt::GetClientCertsReturn,
                            base::Unretained(this), std::cref(cert_request_info), std::move(callback)));
     DCHECK(ok); // callback is already moved and we can't really recover here.
 #else
@@ -115,7 +134,7 @@ void ClientCertOverrideStore::GetClientCerts(const net::SSLCertRequestInfo &cert
 }
 
 // static
-std::unique_ptr<net::ClientCertStore> ClientCertOverrideStore::createNativeStore()
+std::unique_ptr<net::ClientCertStore> ClientCertStoreQt::createNativeStore()
 {
 #if BUILDFLAG(USE_NSS_CERTS)
     return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(net::ClientCertStoreNSS::PasswordDelegateFactory()));
diff --git a/src/core/net/client_cert_override.h b/src/core/net/client_cert_qt.h
index 6f740cc9c..85b0d28be 100644
--- a/src/core/net/client_cert_override.h
+++ b/src/core/net/client_cert_qt.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2018 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 CLIENT_CERT_OVERRIDE_P_H
-#define CLIENT_CERT_OVERRIDE_P_H
+#ifndef CLIENT_CERT_QT_P_H
+#define CLIENT_CERT_QT_P_H
 
 #include "net/ssl/client_cert_store.h"
 #include "base/callback_forward.h"
@@ -15,11 +15,11 @@ class SSLCertRequestInfo;
 namespace QtWebEngineCore {
 struct ClientCertificateStoreData;
 
-class ClientCertOverrideStore : public net::ClientCertStore
+class ClientCertStoreQt : public net::ClientCertStore
 {
 public:
-    ClientCertOverrideStore(ClientCertificateStoreData *storeData);
-    virtual ~ClientCertOverrideStore() override;
+    ClientCertStoreQt(ClientCertificateStoreData *storeData);
+    virtual ~ClientCertStoreQt() override;
     void GetClientCerts(const net::SSLCertRequestInfo &cert_request_info,
                         ClientCertListCallback callback) override;
 private:
diff --git a/src/core/net/client_cert_store_data.cpp b/src/core/net/client_cert_store_data.cpp
index 75c35ecc1..306e782e0 100644
--- a/src/core/net/client_cert_store_data.cpp
+++ b/src/core/net/client_cert_store_data.cpp
@@ -20,16 +20,16 @@
 
 namespace {
 
-class SSLPlatformKeyOverride : public net::ThreadedSSLPrivateKey::Delegate
+class SSLPlatformKeyQt : public net::ThreadedSSLPrivateKey::Delegate
 {
 public:
-    SSLPlatformKeyOverride(const QByteArray &sslKeyInBytes)
+    SSLPlatformKeyQt(const QByteArray &sslKeyInBytes)
     {
         m_mem = BIO_new_mem_buf(sslKeyInBytes, -1);
         m_key = PEM_read_bio_PrivateKey(m_mem, nullptr, nullptr, nullptr);
     }
 
-    ~SSLPlatformKeyOverride() override
+    ~SSLPlatformKeyQt() override
     {
         if (m_key)
             EVP_PKEY_free(m_key);
@@ -65,8 +65,8 @@ public:
 
     std::vector<uint16_t> GetAlgorithmPreferences() override
     {
-        return { SSL_SIGN_RSA_PKCS1_SHA1, SSL_SIGN_RSA_PKCS1_SHA512
-               , SSL_SIGN_RSA_PKCS1_SHA384, SSL_SIGN_RSA_PKCS1_SHA256 };
+        return net::SSLPrivateKey::DefaultAlgorithmPreferences(EVP_PKEY_id(m_key),
+                                                               /* supports pss */ true);
     }
     std::string GetProviderName() override {
         return "qtwebengine";
@@ -82,7 +82,7 @@ scoped_refptr<net::SSLPrivateKey> wrapOpenSSLPrivateKey(const QByteArray &sslKey
         return nullptr;
 
     return base::MakeRefCounted<net::ThreadedSSLPrivateKey>(
-                std::make_unique<SSLPlatformKeyOverride>(sslKeyInBytes),
+                std::make_unique<SSLPlatformKeyQt>(sslKeyInBytes),
                 net::GetSSLPlatformKeyTaskRunner());
 }
 
diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
index a4713150b..1dc1b1577 100644
--- a/src/core/net/proxying_url_loader_factory_qt.cpp
+++ b/src/core/net/proxying_url_loader_factory_qt.cpp
@@ -30,6 +30,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+namespace {
+    network::mojom::URLResponseHeadPtr createResponse(const network::ResourceRequest &request) {
+        const bool disable_web_security = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebSecurity);
+        network::mojom::URLResponseHeadPtr response = network::mojom::URLResponseHead::New();
+        response->response_type = network::cors::CalculateResponseType(
+            request.mode, disable_web_security || (
+            request.request_initiator && request.request_initiator->IsSameOriginWith(url::Origin::Create(request.url))));
+
+        return response;
+    }
+}
+
 namespace QtWebEngineCore {
 
 ASSERT_ENUMS_MATCH(QWebEngineUrlRequestInfo::ResourceTypeMainFrame, blink::mojom::ResourceType::kMainFrame)
@@ -177,11 +189,7 @@ InterceptedRequest::InterceptedRequest(ProfileAdapter *profile_adapter,
     , weak_factory_(this)
 {
     const bool disable_web_security = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebSecurity);
-    current_response_ = network::mojom::URLResponseHead::New();
-    current_response_->response_type = network::cors::CalculateResponseType(
-        request_.mode,
-        disable_web_security || (
-            request_.request_initiator && request_.request_initiator->IsSameOriginWith(url::Origin::Create(request_.url))));
+    current_response_ = createResponse(request_);
     // If there is a client error, clean up the request.
     target_client_.set_disconnect_handler(
             base::BindOnce(&InterceptedRequest::OnURLLoaderClientError, base::Unretained(this)));
@@ -350,9 +358,6 @@ void InterceptedRequest::ContinueAfterIntercept()
                         first_party_url_policy, request_.referrer_policy, request_.referrer.spec(),
                         net::HTTP_TEMPORARY_REDIRECT, toGurl(info.url), absl::nullopt,
                         false /*insecure_scheme_was_upgraded*/);
-
-                // FIXME: Should probably create a new header.
-                current_response_->encoded_data_length = 0;
                 request_.method = redirectInfo.new_method;
                 request_.url = redirectInfo.new_url;
                 request_.site_for_cookies = redirectInfo.new_site_for_cookies;
@@ -360,6 +365,11 @@ void InterceptedRequest::ContinueAfterIntercept()
                 request_.referrer_policy = redirectInfo.new_referrer_policy;
                 if (request_.method == net::HttpRequestHeaders::kGetMethod)
                     request_.request_body = nullptr;
+                // In case of multiple sequential rediredts, current_response_ has previously been moved to target_client_
+                // so we create a new one using the redirect url.
+                if (!current_response_)
+                    current_response_ = createResponse(request_);
+                current_response_->encoded_data_length = 0;
                 target_client_->OnReceiveRedirect(redirectInfo, std::move(current_response_));
                 return;
             }
diff --git a/src/core/ozone/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp
index 75f8e8422..08d626063 100644
--- a/src/core/ozone/gl_context_qt.cpp
+++ b/src/core/ozone/gl_context_qt.cpp
@@ -27,7 +27,8 @@ inline void *resourceForContext(const QByteArray &resource)
 #if QT_CONFIG(opengl)
     QOpenGLContext *shareContext = qt_gl_global_share_context();
     if (!shareContext) {
-        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngineCore::initialize() in your main() function.");
+        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to "
+               "call QtWebEngineQuick::initialize() in your main() function.");
     }
     return qApp->platformNativeInterface()->nativeResourceForContext(resource, shareContext);
 #else
diff --git a/src/core/ozone/gl_share_context_qt.cpp b/src/core/ozone/gl_share_context_qt.cpp
index 02fc02e5d..086317b46 100644
--- a/src/core/ozone/gl_share_context_qt.cpp
+++ b/src/core/ozone/gl_share_context_qt.cpp
@@ -4,14 +4,16 @@
 #include "gl_share_context_qt.h"
 #include <QtGui/qtgui-config.h>
 #include <qpa/qplatformnativeinterface.h>
-#include <QtGui/qopenglcontext_platform.h>
-#if defined(Q_OS_MACOS)
-#include "macos_context_type_helper.h"
-#endif
+
 #if QT_CONFIG(opengl)
+#include <QtGui/qopenglcontext_platform.h>
 #include <QOpenGLContext>
 #include <QOpenGLExtraFunctions>
-#endif
+
+#if defined(Q_OS_MACOS)
+#include "macos_context_type_helper.h"
+#endif // defined(Q_OS_MACOS)
+#endif // QT_CONFIG(opengl)
 
 namespace QtWebEngineCore {
 
@@ -40,7 +42,7 @@ QtShareGLContext::QtShareGLContext(QOpenGLContext *context)
         m_handle = (void *)egl_ctx->nativeContext();
 #endif
     if (!m_handle)
-        qFatal("Could not get handle for shared contex");
+        qFatal("Could not get handle for shared context.");
 #endif // QT_CONFIG(opengl)
 }
 
@@ -63,8 +65,8 @@ void ShareGroupQt::AboutToAddFirstContext()
     QOpenGLContext *shareContext = QOpenGLContext::globalShareContext();
     if (!shareContext) {
         qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to "
-               "call QtWebEngineCore::initialize() in your main() function before QCoreApplication is "
-               "created.");
+               "call QtWebEngineQuick::initialize() in your main() function before "
+               "QCoreApplication is created.");
     }
     m_shareContextQt = new QtShareGLContext(shareContext);
 #endif
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index 7fd6163f2..cd381afc5 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -18,7 +18,7 @@
 #include "services/network/public/cpp/cors/origin_access_list.h"
 #include "services/network/public/mojom/cert_verifier_service.mojom.h"
 
-#include "net/client_cert_override.h"
+#include "net/client_cert_qt.h"
 #include "net/client_cert_store_data.h"
 #include "net/cookie_monster_delegate_qt.h"
 #include "net/system_network_context_manager.h"
@@ -185,9 +185,9 @@ ClientCertificateStoreData *ProfileIODataQt::clientCertificateStoreData()
 std::unique_ptr<net::ClientCertStore> ProfileIODataQt::CreateClientCertStore()
 {
 #if QT_CONFIG(ssl)
-    return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(m_clientCertificateStoreData));
+    return std::unique_ptr<net::ClientCertStore>(new ClientCertStoreQt(m_clientCertificateStoreData));
 #else
-    return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(nullptr));
+    return std::unique_ptr<net::ClientCertStore>(new ClientCertStoreQt(nullptr));
 #endif
 }
 
diff --git a/src/core/render_widget_host_view_qt_delegate_client.cpp b/src/core/render_widget_host_view_qt_delegate_client.cpp
index b192caf7f..7078b82f8 100644
--- a/src/core/render_widget_host_view_qt_delegate_client.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_client.cpp
@@ -57,7 +57,7 @@ QList<TouchPoint> RenderWidgetHostViewQtDelegateClient::mapTouchPointIds(const Q
     Q_ASSERT(output.size() == std::accumulate(output.cbegin(), output.cend(), QSet<int>(),
                  [] (QSet<int> s, const TouchPoint &p) { s.insert(p.second.id()); return s; }).size());
 
-    for (auto &&point : qAsConst(input))
+    for (auto &&point : std::as_const(input))
         if (point.state() == QEventPoint::Released)
             m_touchIdMapping.remove(point.id());
 
@@ -536,7 +536,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event)
     auto sc = qScopeGuard([&] () {
         switch (event->type()) {
             case QEvent::TouchCancel:
-                for (auto &&it : qAsConst(touchPoints))
+                for (auto &&it : std::as_const(touchPoints))
                     m_touchIdMapping.remove(it.second.id());
                 Q_FALLTHROUGH();
 
diff --git a/src/core/render_widget_host_view_qt_delegate_item.cpp b/src/core/render_widget_host_view_qt_delegate_item.cpp
index f6962da14..63eea37e2 100644
--- a/src/core/render_widget_host_view_qt_delegate_item.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_item.cpp
@@ -199,6 +199,8 @@ void RenderWidgetHostViewQtDelegateItem::focusInEvent(QFocusEvent *event)
     if (QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(this)) {
         if (auto *focusChild = iface->focusChild()) {
             QAccessibleEvent focusEvent(focusChild, QAccessible::Focus);
+            if (focusEvent.object())
+                focusEvent.setChild(-1);
             QAccessible::updateAccessibility(&focusEvent);
         }
     }
@@ -307,7 +309,7 @@ void RenderWidgetHostViewQtDelegateItem::itemChange(ItemChange change, const Ite
 {
     QQuickItem::itemChange(change, value);
     if (change == QQuickItem::ItemSceneChange) {
-        for (const QMetaObject::Connection &c : qAsConst(m_windowConnections))
+        for (const QMetaObject::Connection &c : std::as_const(m_windowConnections))
             disconnect(c);
         m_windowConnections.clear();
         if (value.window) {
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index 4a0ba9e43..1588f26ec 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -163,7 +163,7 @@ void UserResourceController::runScripts(QtWebEngineCore::UserScriptData::Injecti
     QList<uint64_t> scriptsToRun = m_frameUserScriptMap.value(globalScriptsIndex);
     scriptsToRun.append(m_frameUserScriptMap.value(renderFrame));
 
-    for (uint64_t id : qAsConst(scriptsToRun)) {
+    for (uint64_t id : std::as_const(scriptsToRun)) {
         const QtWebEngineCore::UserScriptData &script = m_scripts.value(id);
         if (script.injectionPoint != p || (!script.injectForSubframes && !isMainFrame))
             continue;
@@ -295,7 +295,7 @@ void UserResourceController::renderFrameDestroyed(content::RenderFrame *renderFr
     FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(renderFrame);
     if (it == m_frameUserScriptMap.end()) // ASSERT maybe?
         return;
-    for (uint64_t id : qAsConst(it.value())) {
+    for (uint64_t id : std::as_const(it.value())) {
         m_scripts.remove(id);
     }
     m_frameUserScriptMap.remove(renderFrame);
@@ -329,7 +329,7 @@ void UserResourceController::clearScriptsForFrame(content::RenderFrame *frame)
     FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(frame);
     if (it == m_frameUserScriptMap.end())
         return;
-    for (uint64_t id : qAsConst(it.value()))
+    for (uint64_t id : std::as_const(it.value()))
         m_scripts.remove(id);
 
     m_frameUserScriptMap.remove(frame);
diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp
index b24e87e8b..98a640695 100644
--- a/src/core/renderer_host/user_resource_controller_host.cpp
+++ b/src/core/renderer_host/user_resource_controller_host.cpp
@@ -184,7 +184,7 @@ void UserResourceControllerHost::renderProcessStartedWithHost(content::RenderPro
     auto userResourceController = new UserResourceControllerRemote;
     renderer->GetChannel()->GetRemoteAssociatedInterface(userResourceController);
     m_observedProcesses.insert(renderer, userResourceController);
-    for (const UserScript &script : qAsConst(m_profileWideScripts)) {
+    for (const UserScript &script : std::as_const(m_profileWideScripts)) {
         (*userResourceController)->AddScript(script.data());
     }
 }
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 7dc96967f..f6901a071 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -489,7 +489,7 @@ void WebContentsAdapter::initialize(content::SiteInstance *site)
             webContents(), AutofillClientQt::FromWebContents(webContents()),
             /* app_locale = */ "", autofill::AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
 
-#if QT_CONFIG(webengine_printing_and_pdf)
+#if QT_CONFIG(webengine_printing_and_pdf) && QT_CONFIG(webengine_extensions)
     pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
             webContents(), std::make_unique<PDFWebContentsHelperClientQt>());
 #endif
@@ -1780,15 +1780,20 @@ WebContentsAdapterClient::renderProcessExitStatus(int terminationStatus) {
         status = WebContentsAdapterClient::NormalTerminationStatus;
         break;
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
+    case base::TERMINATION_STATUS_LAUNCH_FAILED:
         status = WebContentsAdapterClient::AbnormalTerminationStatus;
         break;
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
+    case base::TERMINATION_STATUS_OOM:
         status = WebContentsAdapterClient::KilledTerminationStatus;
         break;
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
 #if BUILDFLAG(IS_ANDROID)
     case base::TERMINATION_STATUS_OOM_PROTECTED:
 #endif
+#if BUILDFLAG(IS_WIN)
+    case base::TERMINATION_STATUS_INTEGRITY_FAILURE:
+#endif
         status = WebContentsAdapterClient::CrashedTerminationStatus;
         break;
     case base::TERMINATION_STATUS_STILL_RUNNING:
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 66598203e..f3b57484d 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -271,6 +271,7 @@ void WebContentsDelegateQt::PrimaryMainFrameRenderProcessGone(base::TerminationS
         || status == base::TERMINATION_STATUS_STILL_RUNNING) {
         return;
     }
+    LOG(INFO) << "ProcessGone: " << int(status) << " (" << web_contents()->GetCrashedErrorCode() << ")";
 
     setLoadingState(LoadingState::Unloaded);
 }
@@ -744,7 +745,7 @@ bool WebContentsDelegateQt::CheckMediaAccessPermission(content::RenderFrameHost
         return m_viewClient->profileAdapter()->checkPermission(toQt(security_origin), ProfileAdapter::VideoCapturePermission);
     default:
         LOG(INFO) << "WebContentsDelegateQt::CheckMediaAccessPermission: "
-                  << "Unsupported media stream type checked" << type;
+                  << "Unsupported media stream type checked " << type;
         return false;
     }
 }
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index ff47b00e7..3bfd2069d 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -184,7 +184,7 @@ static const char *getGLType(bool enableGLSoftwareRendering, bool disableGpu)
         return glType;
 
     if (!qt_gl_global_share_context() || !qt_gl_global_share_context()->isValid()) {
-        qWarning("WebEngineContext used before QtWebEngineCore::initialize() or OpenGL context "
+        qWarning("WebEngineContext is used before QtWebEngineQuick::initialize() or OpenGL context "
                  "creation failed.");
         return glType;
     }
@@ -891,7 +891,7 @@ const char *qWebEngineChromiumVersion() noexcept
 }
 const char *qWebEngineChromiumSecurityPatchVersion() noexcept
 {
-    return "107.0.5304.110"; // FIXME: Remember to update
+    return "110.0.5481.78"; // FIXME: Remember to update
 }
 
 QT_END_NAMESPACE
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 151365693..588af5cc6 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -145,7 +145,7 @@ QString subProcessPath()
                               % QLatin1Char('/') % processBinary;
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate)) {
                 processPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine process path: %s",
@@ -157,7 +157,7 @@ QString subProcessPath()
             QStringList errorMessage;
             errorMessage.append(
                     QStringLiteral("The following paths were searched for Qt WebEngine Process:"));
-            for (const QString &candidate : qAsConst(candidatePaths))
+            for (const QString &candidate : std::as_const(candidatePaths))
                 errorMessage.append(QStringLiteral("  ") % candidate);
             errorMessage.append(QStringLiteral("but could not find it."));
             if (fromEnv.isEmpty()) {
@@ -207,7 +207,7 @@ QString localesPath()
             candidatePaths << fallbackDir();
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate % QDir::separator() % translationPakFilename)) {
                 potentialLocalesPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine locales path: %s",
@@ -220,7 +220,7 @@ QString localesPath()
             QStringList warningMessage;
             warningMessage.append(
                     QStringLiteral("The following paths were searched for Qt WebEngine locales:"));
-            for (const QString &candidate : qAsConst(candidatePaths))
+            for (const QString &candidate : std::as_const(candidatePaths))
                 warningMessage.append(QStringLiteral("  ") % candidate);
             warningMessage.append(
                     QStringLiteral(
@@ -275,7 +275,7 @@ QString dictionariesPath()
             candidatePaths << libraryDictionariesPath;
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate)) {
                 potentialDictionariesPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine dictionaries path: %s",
@@ -310,7 +310,7 @@ QString resourcesPath()
             candidatePaths << fallbackDir();
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate % QDir::separator() % resourcesPakFilename)) {
                 potentialResourcesPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine resources path: %s",
@@ -323,7 +323,7 @@ QString resourcesPath()
             QStringList errorMessage;
             errorMessage.append(QStringLiteral(
                     "The following paths were searched for Qt WebEngine resources:"));
-            for (const QString &candidate : qAsConst(candidatePaths))
+            for (const QString &candidate : std::as_const(candidatePaths))
                 errorMessage.append(QStringLiteral("  ") % candidate);
             errorMessage.append(QStringLiteral("but could not find any."));
             if (fromEnv.isEmpty()) {
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index e7cc57ba4..3e829457e 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -78,7 +78,7 @@ WebEngineSettings::~WebEngineSettings()
     if (parentSettings)
         parentSettings->childSettings.remove(this);
     // In QML the profile and its settings may be garbage collected before the page and its settings.
-    for (WebEngineSettings *settings : qAsConst(childSettings))
+    for (WebEngineSettings *settings : std::as_const(childSettings))
         settings->parentSettings = nullptr;
 }
 
@@ -448,7 +448,7 @@ bool WebEngineSettings::applySettingsToRendererPreferences(blink::RendererPrefer
 void WebEngineSettings::scheduleApplyRecursively()
 {
     scheduleApply();
-    for (WebEngineSettings *settings : qAsConst(childSettings)) {
+    for (WebEngineSettings *settings : std::as_const(childSettings)) {
         settings->scheduleApply();
     }
 }
diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp
index 7b984a300..c9035f21a 100644
--- a/src/pdf/qpdfbookmarkmodel.cpp
+++ b/src/pdf/qpdfbookmarkmodel.cpp
@@ -50,7 +50,7 @@ public:
 
     int childCount() const
     {
-        return m_childNodes.count();
+        return m_childNodes.size();
     }
 
     int row() const
@@ -172,7 +172,7 @@ struct QPdfBookmarkModelPrivate
             const int titleLength = int(FPDFBookmark_GetTitle(bookmark, nullptr, 0));
 
             QList<char16_t> titleBuffer(titleLength);
-            FPDFBookmark_GetTitle(bookmark, titleBuffer.data(), quint32(titleBuffer.length()));
+            FPDFBookmark_GetTitle(bookmark, titleBuffer.data(), quint32(titleBuffer.size()));
 
             const FPDF_DEST dest = FPDFBookmark_GetDest(document, bookmark);
             const int pageNumber = FPDFDest_GetDestPageIndex(document, dest);
diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp
index b738296ae..a3e412c5c 100644
--- a/src/pdf/qpdfdocument.cpp
+++ b/src/pdf/qpdfdocument.cpp
@@ -17,6 +17,8 @@
 #include <QMutex>
 #include <QVector2D>
 
+#include <QtCore/private/qtools_p.h>
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QRecursiveMutex, pdfMutex)
@@ -39,7 +41,7 @@ public:
         QMetaEnum rolesMetaEnum = doc->metaObject()->enumerator(doc->metaObject()->indexOfEnumerator("PageModelRole"));
         for (int r = Qt::UserRole; r < int(QPdfDocument::PageModelRole::NRoles); ++r) {
             auto name = QByteArray(rolesMetaEnum.valueToKey(r));
-            name[0] = tolower(name[0]);
+            name[0] = QtMiscUtils::toAsciiLower(name[0]);
             m_roleNames.insert(r, name);
         }
         connect(doc, &QPdfDocument::statusChanged, this, [this](QPdfDocument::Status s) {
@@ -639,7 +641,7 @@ QVariant QPdfDocument::metaData(MetaDataField field) const
     const unsigned long len = FPDF_GetMetaText(d->doc, fieldName.constData(), nullptr, 0);
 
     QList<ushort> buf(len);
-    FPDF_GetMetaText(d->doc, fieldName.constData(), buf.data(), buf.length());
+    FPDF_GetMetaText(d->doc, fieldName.constData(), buf.data(), buf.size());
     lock.unlock();
 
     QString text = QString::fromUtf16(reinterpret_cast<const char16_t *>(buf.data()));
@@ -969,7 +971,7 @@ QPdfSelection QPdfDocument::getSelectionAtIndex(int page, int startIndex, int ma
     QString text;
     if (maxLength > 0) {
         text = d->getText(textPage, startIndex, maxLength);
-        rectCount = FPDFText_CountRects(textPage, startIndex, text.length());
+        rectCount = FPDFText_CountRects(textPage, startIndex, text.size());
         for (int i = 0; i < rectCount; ++i) {
             double l, r, b, t;
             FPDFText_GetRect(textPage, i, &l, &t, &r, &b);
@@ -984,12 +986,12 @@ QPdfSelection QPdfDocument::getSelectionAtIndex(int page, int startIndex, int ma
     if (bounds.isEmpty())
         hull = QRectF(d->getCharPosition(textPage, pageHeight, startIndex), QSizeF());
     qCDebug(qLcDoc) << "on page" << page << "at index" << startIndex << "maxLength" << maxLength
-                    << "got" << text.length() << "chars," << rectCount << "rects within" << hull;
+                    << "got" << text.size() << "chars," << rectCount << "rects within" << hull;
 
     FPDFText_ClosePage(textPage);
     FPDF_ClosePage(pdfPage);
 
-    return QPdfSelection(text, bounds, hull, startIndex, startIndex + text.length());
+    return QPdfSelection(text, bounds, hull, startIndex, startIndex + text.size());
 }
 
 /*!
diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp
index 06afd9641..a8e98926a 100644
--- a/src/pdf/qpdflinkmodel.cpp
+++ b/src/pdf/qpdflinkmodel.cpp
@@ -68,7 +68,7 @@ int QPdfLinkModel::rowCount(const QModelIndex &parent) const
 {
     Q_D(const QPdfLinkModel);
     Q_UNUSED(parent);
-    return d->links.count();
+    return d->links.size();
 }
 
 /*! \internal
diff --git a/src/pdf/qpdfpagenavigator.cpp b/src/pdf/qpdfpagenavigator.cpp
index 9e807e5cd..253c1dff8 100644
--- a/src/pdf/qpdfpagenavigator.cpp
+++ b/src/pdf/qpdfpagenavigator.cpp
@@ -62,7 +62,7 @@ QPdfPageNavigator::~QPdfPageNavigator()
 */
 void QPdfPageNavigator::forward()
 {
-    if (d->currentHistoryIndex >= d->pageHistory.count() - 1)
+    if (d->currentHistoryIndex >= d->pageHistory.size() - 1)
         return;
     const bool backAvailableWas = backAvailable();
     const bool forwardAvailableWas = forwardAvailable();
@@ -122,7 +122,7 @@ void QPdfPageNavigator::back()
 */
 int QPdfPageNavigator::currentPage() const
 {
-    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.count())
+    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.size())
         return -1; // only until ctor or clear() runs
     return d->pageHistory.at(d->currentHistoryIndex)->page;
 }
@@ -136,7 +136,7 @@ int QPdfPageNavigator::currentPage() const
 */
 QPointF QPdfPageNavigator::currentLocation() const
 {
-    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.count())
+    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.size())
         return QPointF();
     return d->pageHistory.at(d->currentHistoryIndex)->location;
 }
@@ -149,14 +149,14 @@ QPointF QPdfPageNavigator::currentLocation() const
 */
 qreal QPdfPageNavigator::currentZoom() const
 {
-    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.count())
+    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.size())
         return 1;
     return d->pageHistory.at(d->currentHistoryIndex)->zoom;
 }
 
 QPdfLink QPdfPageNavigator::currentLink() const
 {
-    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.count())
+    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.size())
         return QPdfLink();
     return QPdfLink(d->pageHistory.at(d->currentHistoryIndex).data());
 }
@@ -195,9 +195,9 @@ void QPdfPageNavigator::jump(QPdfLink destination)
     const bool forwardAvailableWas = forwardAvailable();
     if (!d->changing) {
         if (d->currentHistoryIndex >= 0 && forwardAvailableWas)
-            d->pageHistory.remove(d->currentHistoryIndex + 1, d->pageHistory.count() - d->currentHistoryIndex - 1);
+            d->pageHistory.remove(d->currentHistoryIndex + 1, d->pageHistory.size() - d->currentHistoryIndex - 1);
         d->pageHistory.append(destination.d);
-        d->currentHistoryIndex = d->pageHistory.count() - 1;
+        d->currentHistoryIndex = d->pageHistory.size() - 1;
     }
     if (zoomChange)
         emit currentZoomChanged(currentZoom());
@@ -251,9 +251,9 @@ void QPdfPageNavigator::jump(int page, const QPointF &location, qreal zoom)
     const bool forwardAvailableWas = forwardAvailable();
     if (!d->changing) {
         if (d->currentHistoryIndex >= 0 && forwardAvailableWas)
-            d->pageHistory.remove(d->currentHistoryIndex + 1, d->pageHistory.count() - d->currentHistoryIndex - 1);
+            d->pageHistory.remove(d->currentHistoryIndex + 1, d->pageHistory.size() - d->currentHistoryIndex - 1);
         d->pageHistory.append(QExplicitlySharedDataPointer<QPdfLinkPrivate>(new QPdfLinkPrivate(page, location, zoom)));
-        d->currentHistoryIndex = d->pageHistory.count() - 1;
+        d->currentHistoryIndex = d->pageHistory.size() - 1;
     }
     if (zoomChange)
         emit currentZoomChanged(currentZoom());
@@ -293,7 +293,7 @@ void QPdfPageNavigator::jump(int page, const QPointF &location, qreal zoom)
 */
 void QPdfPageNavigator::update(int page, const QPointF &location, qreal zoom)
 {
-    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.count())
+    if (d->currentHistoryIndex < 0 || d->currentHistoryIndex >= d->pageHistory.size())
         return;
     int currentPageWas = currentPage();
     QPointF currentLocationWas = currentLocation();
@@ -340,7 +340,7 @@ bool QPdfPageNavigator::backAvailable() const
 */
 bool QPdfPageNavigator::forwardAvailable() const
 {
-    return d->currentHistoryIndex < d->pageHistory.count() - 1;
+    return d->currentHistoryIndex < d->pageHistory.size() - 1;
 }
 
 /*!
diff --git a/src/pdf/qpdfpagerenderer.cpp b/src/pdf/qpdfpagerenderer.cpp
index e46261817..771fc67ef 100644
--- a/src/pdf/qpdfpagerenderer.cpp
+++ b/src/pdf/qpdfpagerenderer.cpp
@@ -282,7 +282,7 @@ quint64 QPdfPageRenderer::requestPage(int pageNumber, QSize imageSize,
     if (!d_ptr->m_document || d_ptr->m_document->status() != QPdfDocument::Status::Ready)
         return 0;
 
-    for (const auto &request : qAsConst(d_ptr->m_pendingRequests)) {
+    for (const auto &request : std::as_const(d_ptr->m_pendingRequests)) {
         if (request.pageNumber == pageNumber
             && request.imageSize == imageSize
             && request.options == options)
diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp
index e8946ea86..a8946ccfe 100644
--- a/src/pdf/qpdfsearchmodel.cpp
+++ b/src/pdf/qpdfsearchmodel.cpp
@@ -161,7 +161,7 @@ QList<QPdfLink> QPdfSearchModel::resultsOnPage(int page) const
 {
     Q_D(const QPdfSearchModel);
     const_cast<QPdfSearchModelPrivate *>(d)->doSearch(page);
-    if (d->searchResults.count() <= page)
+    if (d->searchResults.size() <= page)
         return {};
     return d->searchResults[page];
 }
@@ -207,7 +207,7 @@ void QPdfSearchModel::timerEvent(QTimerEvent *event)
         return;
     if (!d->document || d->nextPageToUpdate >= d->document->pageCount()) {
         if (d->document)
-            qCDebug(qLcS) << "done updating search results on" << d->searchResults.count() << "pages";
+            qCDebug(qLcS) << "done updating search results on" << d->searchResults.size() << "pages";
         killTimer(d->updateTimerId);
         d->updateTimerId = -1;
     }
@@ -234,7 +234,7 @@ void QPdfSearchModelPrivate::clearResults()
 
 bool QPdfSearchModelPrivate::doSearch(int page)
 {
-    if (page < 0 || page >= pagesSearched.count() || searchString.isEmpty())
+    if (page < 0 || page >= pagesSearched.size() || searchString.isEmpty())
         return false;
     if (pagesSearched[page])
         return true;
@@ -298,7 +298,7 @@ bool QPdfSearchModelPrivate::doSearch(int page)
                 if (si < 0)
                     qWarning() << "search string" << searchString << "not found in context" << context;
                 contextBefore = context.mid(0, si);
-                contextAfter = context.mid(si + searchString.length());
+                contextAfter = context.mid(si + searchString.size());
             }
         }
         if (!rects.isEmpty())
@@ -308,15 +308,15 @@ bool QPdfSearchModelPrivate::doSearch(int page)
     FPDFText_ClosePage(textPage);
     FPDF_ClosePage(pdfPage);
     qCDebug(qLcS) << searchString << "took" << timer.elapsed() << "ms to find"
-                  << newSearchResults.count() << "results on page" << page;
+                  << newSearchResults.size() << "results on page" << page;
 
     pagesSearched[page] = true;
     searchResults[page] = newSearchResults;
-    if (newSearchResults.count() > 0) {
+    if (newSearchResults.size() > 0) {
         int rowsBefore = rowsBeforePage(page);
-        qCDebug(qLcS) << "from row" << rowsBefore << "rowCount" << rowCountSoFar << "increasing by" << newSearchResults.count();
-        rowCountSoFar += newSearchResults.count();
-        q->beginInsertRows(QModelIndex(), rowsBefore, rowsBefore + newSearchResults.count() - 1);
+        qCDebug(qLcS) << "from row" << rowsBefore << "rowCount" << rowCountSoFar << "increasing by" << newSearchResults.size();
+        rowCountSoFar += newSearchResults.size();
+        q->beginInsertRows(QModelIndex(), rowsBefore, rowsBefore + newSearchResults.size() - 1);
         q->endInsertRows();
     }
     return true;
@@ -332,7 +332,7 @@ QPdfSearchModelPrivate::PageAndIndex QPdfSearchModelPrivate::pageAndIndexForResu
     for (int page = 0; page < pageCount; ++page) {
         if (!pagesSearched[page])
             doSearch(page);
-        totalSoFar += searchResults[page].count();
+        totalSoFar += searchResults[page].size();
         if (totalSoFar > resultIndex)
             return {page, resultIndex - previousTotalSoFar};
         previousTotalSoFar = totalSoFar;
@@ -344,7 +344,7 @@ int QPdfSearchModelPrivate::rowsBeforePage(int page)
 {
     int ret = 0;
     for (int i = 0; i < page; ++i)
-        ret += searchResults[i].count();
+        ret += searchResults[i].size();
     return ret;
 }
 
diff --git a/src/pdfquick/qquickpdfdocument.cpp b/src/pdfquick/qquickpdfdocument.cpp
index 368725a8e..5564a7474 100644
--- a/src/pdfquick/qquickpdfdocument.cpp
+++ b/src/pdfquick/qquickpdfdocument.cpp
@@ -8,6 +8,7 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQuick/qquickitem.h>
+#include <QtQml/qqmlfile.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -41,9 +42,9 @@ void QQuickPdfDocument::classBegin()
 {
     m_doc = static_cast<QPdfDocument *>(qmlExtendedObject(this));
     Q_ASSERT(m_doc);
-    connect(m_doc, &QPdfDocument::passwordChanged, this, [this]() {
-        if (resolvedSource().isValid() && resolvedSource().isLocalFile())
-            m_doc->load(resolvedSource().path());
+    connect(m_doc, &QPdfDocument::passwordChanged, this, [this]() -> void {
+        if (resolvedSource().isValid())
+            m_doc->load(QQmlFile::urlToLocalFileOrQrc(resolvedSource()));
     });
     connect(m_doc, &QPdfDocument::statusChanged, this, [this] (QPdfDocument::Status status) {
         emit errorChanged();
diff --git a/src/pdfquick/qquickpdfselection.cpp b/src/pdfquick/qquickpdfselection.cpp
index ff50bcb23..4776cb8b4 100644
--- a/src/pdfquick/qquickpdfselection.cpp
+++ b/src/pdfquick/qquickpdfselection.cpp
@@ -188,12 +188,12 @@ void QQuickPdfSelection::keyReleaseEvent(QKeyEvent *ev)
             return;
         // iOS sends MoveToPreviousWord first to get to the beginning of the word,
         // and then SelectNextWord to select the whole word.
-        int i = allText.lastIndexOf(WordDelimiter, m_fromCharIndex - allText.length());
+        int i = allText.lastIndexOf(WordDelimiter, m_fromCharIndex - allText.size());
         if (i < 0)
             i = 0;
         else
             i += 1; // don't select the space before the word
-        auto sel = m_document->document()->getSelectionAtIndex(m_page, i, m_text.length() + m_fromCharIndex - i);
+        auto sel = m_document->document()->getSelectionAtIndex(m_page, i, m_text.size() + m_fromCharIndex - i);
         update(sel);
         QGuiApplication::inputMethod()->update(Qt::ImAnchorRectangle);
     } else if (ev == QKeySequence::SelectNextWord) {
@@ -201,8 +201,8 @@ void QQuickPdfSelection::keyReleaseEvent(QKeyEvent *ev)
             return;
         int i = allText.indexOf(WordDelimiter, m_toCharIndex);
         if (i < 0)
-            i = allText.length(); // go to the end of m_textAfter
-        auto sel = m_document->document()->getSelectionAtIndex(m_page, m_fromCharIndex, m_text.length() + i - m_toCharIndex);
+            i = allText.size(); // go to the end of m_textAfter
+        auto sel = m_document->document()->getSelectionAtIndex(m_page, m_fromCharIndex, m_text.size() + i - m_toCharIndex);
         update(sel);
         QGuiApplication::inputMethod()->update(Qt::ImCursorRectangle);
     } else if (ev == QKeySequence::Copy) {
diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp
index c4f233cb0..831b51515 100644
--- a/src/pdfwidgets/qpdfview.cpp
+++ b/src/pdfwidgets/qpdfview.cpp
@@ -136,7 +136,7 @@ void QPdfViewPrivate::pageRendered(int pageNumber, QSize imageSize, const QImage
     Q_UNUSED(requestId);
 
     if (!m_cachedPagesLRU.contains(pageNumber)) {
-        if (m_cachedPagesLRU.length() > m_pageCacheLimit)
+        if (m_cachedPagesLRU.size() > m_pageCacheLimit)
             m_pageCache.remove(m_cachedPagesLRU.takeFirst());
 
         m_cachedPagesLRU.append(pageNumber);
diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp
index f21750053..46e531716 100644
--- a/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp
+++ b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp
@@ -126,7 +126,7 @@ QQmlListProperty<QQuickWebEngineClientCertificateOption> QQuickWebEngineClientCe
 {
     if (m_certificates.empty()) {
         QList<QSslCertificate> certificates = d_ptr->certificates();
-        for (int i = 0; i < certificates.count(); ++i)
+        for (int i = 0; i < certificates.size(); ++i)
             m_certificates.push_back(new QQuickWebEngineClientCertificateOption(this, i));
     }
 
diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider.cpp b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
index 087ab029b..56bbb97ac 100644
--- a/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
+++ b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
@@ -35,9 +35,9 @@ static QSize largestSize(const QList<QSize> &availableSizes)
 
 static QSize fitSize(const QList<QSize> &availableSizes, const QSize &requestedSize)
 {
-    Q_ASSERT(availableSizes.count());
+    Q_ASSERT(availableSizes.size());
     QSize result = largestSize(availableSizes);
-    if (availableSizes.count() == 1 || area(requestedSize) >= area(result))
+    if (availableSizes.size() == 1 || area(requestedSize) >= area(result))
         return result;
 
     for (const QSize &size : availableSizes) {
diff --git a/src/webenginequick/api/qquickwebengineforeigntypes_p.h b/src/webenginequick/api/qquickwebengineforeigntypes_p.h
index d8351c855..1591e596f 100644
--- a/src/webenginequick/api/qquickwebengineforeigntypes_p.h
+++ b/src/webenginequick/api/qquickwebengineforeigntypes_p.h
@@ -30,6 +30,7 @@
 #include <QtWebEngineCore/qwebenginefullscreenrequest.h>
 #include <QtWebEngineCore/qwebenginecontextmenurequest.h>
 #include <QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h>
+#include <QtWebEngineCore/qwebenginefilesystemaccessrequest.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -180,6 +181,23 @@ struct ForeignWebEngineFindTextResult
     QML_UNCREATABLE("")
 };
 
+struct ForeginWebEngineFileSystemAccessRequest
+{
+    Q_GADGET
+    QML_FOREIGN(QWebEngineFileSystemAccessRequest)
+    QML_NAMED_ELEMENT(webEngineFileSystemAccessRequest)
+    QML_ADDED_IN_VERSION(6, 4)
+    QML_UNCREATABLE("")
+};
+
+namespace ForeginWebEngineFileSystemAccessRequestNamespace
+{
+    Q_NAMESPACE
+    QML_FOREIGN_NAMESPACE(QWebEngineFileSystemAccessRequest)
+    QML_NAMED_ELEMENT(WebEngineFileSystemAccessRequest)
+    QML_ADDED_IN_VERSION(6, 4)
+};
+
 QT_END_NAMESPACE
 
 #endif // QQUICKWEBENGINEFOREIGNTYPES_H
diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp
index 1cfaab3f5..3c7989cf0 100644
--- a/src/webenginequick/api/qquickwebengineprofile.cpp
+++ b/src/webenginequick/api/qquickwebengineprofile.cpp
@@ -209,10 +209,12 @@ void QQuickWebEngineProfilePrivate::downloadRequested(DownloadItemInfo &info)
     Q_Q(QQuickWebEngineProfile);
 
     Q_ASSERT(!m_ongoingDownloads.contains(info.id));
-    QWebEngineDownloadRequestPrivate *itemPrivate = new QWebEngineDownloadRequestPrivate(m_profileAdapter, info.url);
+    QWebEngineDownloadRequestPrivate *itemPrivate =
+            new QWebEngineDownloadRequestPrivate(m_profileAdapter);
     itemPrivate->downloadId = info.id;
     itemPrivate->downloadState = QWebEngineDownloadRequest::DownloadRequested;
     itemPrivate->startTime = info.startTime;
+    itemPrivate->downloadUrl = info.url;
     itemPrivate->totalBytes = info.totalBytes;
     itemPrivate->mimeType = info.mimeType;
     itemPrivate->downloadDirectory = QFileInfo(info.path).path();
diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.cpp b/src/webenginequick/api/qquickwebenginescriptcollection.cpp
index 17db0d4d0..a58d97832 100644
--- a/src/webenginequick/api/qquickwebenginescriptcollection.cpp
+++ b/src/webenginequick/api/qquickwebenginescriptcollection.cpp
@@ -199,7 +199,7 @@ QJSValue QQuickWebEngineScriptCollection::collection() const
     const QList<QWebEngineScript> &list = d->toList();
     QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(d->m_qmlEngine);
     QV4::Scope scope(v4);
-    QV4::Scoped<QV4::ArrayObject> scriptArray(scope, v4->newArrayObject(list.length()));
+    QV4::Scoped<QV4::ArrayObject> scriptArray(scope, v4->newArrayObject(list.size()));
     int i = 0;
     for (const auto &val : list) {
         QV4::ScopedValue sv(scope, v4->fromVariant(QVariant::fromValue(val)));
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index 9ceffe09f..deb68c6d3 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -2324,7 +2324,7 @@ void QQuickContextMenuBuilder::addMenuItem(ContextMenuItem menuItem)
     case ContextMenuItem::SpellingSuggestions:
     {
         QPointer<QQuickWebEngineView> thisRef(m_view);
-        for (int i = 0; i < m_contextData->spellCheckerSuggestions().count() && i < 4; i++) {
+        for (int i = 0; i < m_contextData->spellCheckerSuggestions().size() && i < 4; i++) {
             action = new QQuickWebEngineAction(m_menu);
             QString replacement = m_contextData->spellCheckerSuggestions().at(i);
             QObject::connect(action, &QQuickWebEngineAction::triggered, [thisRef, replacement] { thisRef->replaceMisspelledWord(replacement); });
diff --git a/src/webenginequick/doc/src/webengine_certificate_error.qdoc b/src/webenginequick/doc/src/webengine_certificate_error.qdoc
index aec8e2d42..93bad9fb1 100644
--- a/src/webenginequick/doc/src/webengine_certificate_error.qdoc
+++ b/src/webenginequick/doc/src/webengine_certificate_error.qdoc
@@ -9,7 +9,7 @@
 
     \brief A utility type for ignoring certificate errors or rejecting erroneous certificates.
 
-    This QML type contains information about a certificate error that occurred. The \l error
+    This QML type contains information about a certificate error that occurred. The \l type
     property holds the reason that the error occurred and the \l description property holds a
     short localized description of the error. The \l url property holds the URL that triggered
     the error.
@@ -49,7 +49,7 @@
     The URL that triggered the error.
  */
 /*!
-    \qmlproperty enumeration WebEngineCertificateError::error
+    \qmlproperty enumeration WebEngineCertificateError::type
     \readonly
 
     The type of the error.
diff --git a/src/webenginequick/doc/src/webenginescript.qdoc b/src/webenginequick/doc/src/webenginescript.qdoc
index 5919b29e3..9708ffbf8 100644
--- a/src/webenginequick/doc/src/webenginescript.qdoc
+++ b/src/webenginequick/doc/src/webenginescript.qdoc
@@ -32,7 +32,7 @@
     \l{WebEngineScriptCollection::find}{WebEngineScriptCollection.find} method.
 */
 
-*!
+/*!
     \qmlproperty url WebEngineScript::sourceUrl
 
     This property holds the remote source location of the user script (if any).
diff --git a/src/webenginequick/ui/CMakeLists.txt b/src/webenginequick/ui/CMakeLists.txt
index c24d8da8d..f2f281ef5 100644
--- a/src/webenginequick/ui/CMakeLists.txt
+++ b/src/webenginequick/ui/CMakeLists.txt
@@ -4,6 +4,7 @@ set(qml_files
     "AutofillPopup.qml"
     "ColorDialog.qml"
     "ConfirmDialog.qml"
+    "DirectoryPicker.qml"
     "FilePicker.qml"
     "Menu.qml"
     "MenuItem.qml"
diff --git a/src/webenginequick/ui/DirectoryPicker.qml b/src/webenginequick/ui/DirectoryPicker.qml
new file mode 100644
index 000000000..a8a6d47c9
--- /dev/null
+++ b/src/webenginequick/ui/DirectoryPicker.qml
@@ -0,0 +1,15 @@
+// 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
+
+import QtQuick.Dialogs
+
+FolderDialog {
+    id: folderDialog
+    objectName: "folderDialog"
+
+    signal folderSelected(var folder)
+
+    onAccepted: {
+        folderSelected([selectedFolder])
+    }
+}
diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp
index 19dd04298..a075a4c9b 100644
--- a/src/webenginequick/ui_delegates_manager.cpp
+++ b/src/webenginequick/ui_delegates_manager.cpp
@@ -136,7 +136,7 @@ bool UIDelegatesManager::ensureComponentLoaded(ComponentType type)
     if (!engine)
         return false;
 
-    for (const QString &importDir : qAsConst(m_importDirs)) {
+    for (const QString &importDir : std::as_const(m_importDirs)) {
         const QString componentFilePath = importDir % QLatin1Char('/') % fileName;
 
         if (!QFileInfo(componentFilePath).exists())
@@ -356,6 +356,10 @@ void UIDelegatesManager::showDialog(QSharedPointer<AuthenticationDialogControlle
 
 void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> controller)
 {
+    if (controller->mode() == FilePickerController::UploadFolder) {
+        showDirectoryPicker(controller);
+        return;
+    }
 
     if (!ensureComponentLoaded(FilePicker))
         return;
@@ -367,19 +371,21 @@ void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> con
     filePicker->setParent(m_view);
     filePickerComponent->completeCreate();
 
+    static int fileModeIndex = filePicker->metaObject()->indexOfEnumerator("FileMode");
+    QMetaEnum fileModeEnum = filePicker->metaObject()->enumerator(fileModeIndex);
+
     // Fine-tune some properties depending on the mode.
     switch (controller->mode()) {
     case FilePickerController::Open:
+        filePicker->setProperty("fileMode", fileModeEnum.keyToValue("OpenFile"));
         break;
     case FilePickerController::Save:
-        filePicker->setProperty("selectExisting", false);
+        filePicker->setProperty("fileMode", fileModeEnum.keyToValue("SaveFile"));
         break;
     case FilePickerController::OpenMultiple:
-        filePicker->setProperty("selectMultiple", true);
+        filePicker->setProperty("fileMode", fileModeEnum.keyToValue("OpenFiles"));
         break;
     case FilePickerController::UploadFolder:
-        filePicker->setProperty("selectFolder", true);
-        break;
     default:
         Q_UNREACHABLE();
     }
@@ -403,6 +409,35 @@ void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> con
     QMetaObject::invokeMethod(filePicker, "open");
 }
 
+void UIDelegatesManager::showDirectoryPicker(QSharedPointer<FilePickerController> controller)
+{
+    if (!ensureComponentLoaded(DirectoryPicker))
+        return;
+
+    QQmlContext *context = qmlContext(m_view);
+    QObject *directoryPicker = directoryPickerComponent->beginCreate(context);
+    if (QQuickItem *item = qobject_cast<QQuickItem*>(directoryPicker))
+        item->setParentItem(m_view);
+    directoryPicker->setParent(m_view);
+    directoryPickerComponent->completeCreate();
+
+    QQmlProperty directoryPickedSignal(directoryPicker, QStringLiteral("onFolderSelected"));
+    CHECK_QML_SIGNAL_PROPERTY(directoryPickedSignal, directoryPickerComponent->url());
+    QQmlProperty rejectSignal(directoryPicker, QStringLiteral("onRejected"));
+    CHECK_QML_SIGNAL_PROPERTY(rejectSignal, directoryPickerComponent->url());
+    static int acceptedIndex = controller->metaObject()->indexOfSlot("accepted(QVariant)");
+    QObject::connect(directoryPicker, directoryPickedSignal.method(), controller.data(), controller->metaObject()->method(acceptedIndex));
+    static int rejectedIndex = controller->metaObject()->indexOfSlot("rejected()");
+    QObject::connect(directoryPicker, rejectSignal.method(), controller.data(), controller->metaObject()->method(rejectedIndex));
+
+    // delete when done.
+    static int deleteLaterIndex = directoryPicker->metaObject()->indexOfSlot("deleteLater()");
+    QObject::connect(directoryPicker, directoryPickedSignal.method(), directoryPicker, directoryPicker->metaObject()->method(deleteLaterIndex));
+    QObject::connect(directoryPicker, rejectSignal.method(), directoryPicker, directoryPicker->metaObject()->method(deleteLaterIndex));
+
+    QMetaObject::invokeMethod(directoryPicker, "open");
+}
+
 class TemporaryCursorMove
 {
 public:
diff --git a/src/webenginequick/ui_delegates_manager.h b/src/webenginequick/ui_delegates_manager.h
index 70e5ba00d..24dde656c 100644
--- a/src/webenginequick/ui_delegates_manager.h
+++ b/src/webenginequick/ui_delegates_manager.h
@@ -22,6 +22,7 @@
     F(ConfirmDialog, confirmDialog) SEPARATOR \
     F(PromptDialog, promptDialog) SEPARATOR \
     F(FilePicker, filePicker) SEPARATOR \
+    F(DirectoryPicker, directoryPicker) SEPARATOR \
     F(AuthenticationDialog, authenticationDialog) SEPARATOR \
     F(ToolTip, toolTip) SEPARATOR \
     F(TouchHandle, touchHandle) SEPARATOR \
@@ -80,6 +81,7 @@ public:
     void showDialog(QSharedPointer<JavaScriptDialogController>);
     void showDialog(QSharedPointer<AuthenticationDialogController>);
     void showFilePicker(QSharedPointer<FilePickerController>);
+    void showDirectoryPicker(QSharedPointer<FilePickerController>);
     virtual void showMenu(QObject *menu);
     void showToolTip(const QString &text);
     QQuickItem *createTouchHandle();
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 51bd74e4a..b9aef4a38 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -184,7 +184,7 @@ protected:
         // We don't have a way to catch a top-level window change with QWidget
         // but a widget will most likely be shown again if it changes, so do
         // the reconnection at this point.
-        for (const QMetaObject::Connection &c : qAsConst(m_windowConnections))
+        for (const QMetaObject::Connection &c : std::as_const(m_windowConnections))
             disconnect(c);
         m_windowConnections.clear();
         if (QWindow *w = Window()) {
@@ -437,7 +437,7 @@ void QWebEngineViewPrivate::contextMenuRequested(QWebEngineContextMenuRequest *r
         Q_EMIT q_ptr->customContextMenuRequested(request->position());
         return;
     case Qt::ActionsContextMenu:
-        if (q_ptr->actions().count()) {
+        if (q_ptr->actions().size()) {
             QContextMenuEvent event(QContextMenuEvent::Mouse, request->position(),
                                     q_ptr->mapToGlobal(request->position()));
             QMenu::exec(q_ptr->actions(), event.globalPos(), 0, q_ptr);
@@ -1523,7 +1523,7 @@ void QContextMenuBuilder::addMenuItem(ContextMenuItem menuItem)
         action = thisRef->action(QWebEnginePage::ViewSource);
         break;
     case ContextMenuItem::SpellingSuggestions:
-        for (int i = 0; i < m_contextData->spellCheckerSuggestions().count() && i < 4; i++) {
+        for (int i = 0; i < m_contextData->spellCheckerSuggestions().size() && i < 4; i++) {
             action = new QAction(m_menu);
             QString replacement = m_contextData->spellCheckerSuggestions().at(i);
             QObject::connect(action, &QAction::triggered, [thisRef, replacement] {
diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp
index 4ae840e72..67e2d8ae4 100644
--- a/tests/auto/core/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp
@@ -67,8 +67,8 @@ void tst_CertificateError::handleError_data()
 
 void tst_CertificateError::handleError()
 {
-    HttpsServer server(":/resources/server.pem",":/resources/server.key");
-    server.setExpectError(true);
+    HttpsServer server(":/resources/server.pem", ":/resources/server.key", "");
+    server.setExpectError(false);
     QVERIFY(server.start());
 
     connect(&server, &HttpsServer::newRequest, [&] (HttpReqRep *rr) {
@@ -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,9 +102,10 @@ 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());
 }
 
 void tst_CertificateError::fatalError()
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/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
--- /dev/null
+++ b/tests/auto/core/origins/resources/red.png
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index 6596b3fa0..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.
@@ -1005,12 +1069,17 @@ 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();
+    m_page->clearLog();
     QStringList schemesTo, expected, results;
     for (auto it = testPairs.begin(), end = testPairs.end(); it != end; ++it) {
 
@@ -1019,15 +1088,10 @@ 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.count() > 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->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));
diff --git a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt
index fa2d5e538..ee5473348 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,13 @@ 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/client2.pem"
+    "resources/client2.key"
+    "resources/ca.pem"
 )
 
 qt_internal_add_resource(tst_qwebengineclientcertificatestore "tst_qwebengineclientcertificatestore"
@@ -19,3 +31,47 @@ qt_internal_add_resource(tst_qwebengineclientcertificatestore "tst_qwebenginecli
         ${tst_qwebengineclientcertificatestore_resource_files}
 )
 
+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 AND certutil_EXECUTABLE)
+        add_custom_command(
+            DEPENDS resources/client2.p12
+            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 ""
+            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)
+    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
+        )
+    endif()
+endif()
+
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/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..81e7eb624
--- /dev/null
+++ b/tests/auto/core/qwebengineclientcertificatestore/resources/client2.p12
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/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 3ca28b901..7d82a5640 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
 {
@@ -14,8 +19,12 @@ public:
     ~tst_QWebEngineClientCertificateStore();
 
 private Q_SLOTS:
+    void init();
+    void cleanup();
     void addAndListCertificates();
     void removeAndClearCertificates();
+    void clientAuthentication_data();
+    void clientAuthentication();
 };
 
 tst_QWebEngineClientCertificateStore::tst_QWebEngineClientCertificateStore()
@@ -26,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
@@ -52,21 +74,93 @@ 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());
+    addAndListCertificates();
+    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());
+}
+
+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());
+
+    connect(&server, &HttpsServer::newRequest, [&](HttpReqRep *rr) {
+        rr->setResponseBody(QByteArrayLiteral("<html><body>TEST</body></html>"));
+        rr->sendResponse();
+    });
+
+    QFile certFile(client_certificate);
+    certFile.open(QIODevice::ReadOnly);
+    const QSslCertificate cert(certFile.readAll(), QSsl::Pem);
+
+    QFile keyFile(client_key);
+    keyFile.open(QIODevice::ReadOnly);
+    const QSslKey sslKey(keyFile.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, "");
+
+    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();
+    });
+    connect(&page, &QWebEnginePage::selectClientCertificate, &page,
+            [&cert](QWebEngineClientCertificateSelection selection) {
+                QVERIFY(!selection.certificates().isEmpty());
+                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);
+    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)
diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index e0fee6b08..8b6822148 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,28 +285,28 @@ 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());
-    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())));
 }
@@ -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/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"
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index 6dd64ab88..e08af77e7 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()
@@ -79,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/httpserver/httpsserver.h b/tests/auto/httpserver/httpsserver.h
index d064c1416..10deeb322 100644
--- a/tests/auto/httpserver/httpsserver.h
+++ b/tests/auto/httpserver/httpsserver.h
@@ -7,51 +7,56 @@
 #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,
+                                const QString &ca)
 {
-    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);
+    QSslConfiguration configuration(QSslConfiguration::defaultConfiguration());
 
-        if (!socket->setSocketDescriptor(d)) {
-            qWarning() << "Failed to setup ssl socket!";
-            delete socket;
-            return;
+    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;
         }
+    } else {
+        qCritical() << "Could not find 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();
+    QList<QSslCertificate> localCerts = QSslCertificate::fromPath(certificateFileName);
+    if (!localCerts.isEmpty()) {
+        configuration.setLocalCertificateChain(localCerts);
+    } 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);
+    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;
+        }
     }
 
-    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,
+    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/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/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
diff --git a/tests/auto/pdfquick/multipageview/tst_multipageview.cpp b/tests/auto/pdfquick/multipageview/tst_multipageview.cpp
index eb70ebf17..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,27 +259,27 @@ 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.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);
+    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()
-                     << "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()
@@ -288,13 +290,13 @@ 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"));
     QString sel = pdfView->property("selectedText").toString();
-    QCOMPARE(sel.length(), 1073);
+    QCOMPARE(sel.size(), 1073);
 
 #if QT_CONFIG(clipboard)
     QClipboard *clip = qApp->clipboard();
@@ -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,17 +330,17 @@ 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>>>();
-    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/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/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_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/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/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: [];
 }
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 5018c7e78..9e928157e 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -105,11 +105,18 @@ 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);
         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
@@ -118,6 +125,8 @@ public:
         QDir().rmdir(dirname);
     }
 
+    Q_INVOKABLE void createDirectory(const QString dirname) { QDir(tempDir.path()).mkdir(dirname); }
+
 private:
     QTemporaryDir tempDir;
 };
@@ -253,8 +262,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(
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..c81a27b3a 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);
 }
 
@@ -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);
@@ -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;
@@ -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);
@@ -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..bfa97ea79 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"));
@@ -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");
     }
 
@@ -4890,7 +4894,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 +4939,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 +5005,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 +5019,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 +5062,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 +5102,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);
     }
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);
diff --git a/tools/scripts/gn_find_mocables.py b/tools/scripts/gn_find_mocables.py
index 71ff83104..68f648889 100644
--- a/tools/scripts/gn_find_mocables.py
+++ b/tools/scripts/gn_find_mocables.py
@@ -7,7 +7,7 @@ import os
 
 mocables = set()
 includedMocs = set()
-files = sys.argv[2:]
+files = sys.argv[1:]
 
 for f in filter(os.path.isfile, files):
     inBlockComment = False