93 files changed, 922 insertions, 1155 deletions

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 20e191a4f..33edf25f1 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -30,9 +30,9 @@
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebengineurlrequestinfo.h>
 #include <QtWebEngineCore/qwebengineurlrequestinterceptor.h>
+#include <QtWebEngineCore/qwebenginesettings.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
 #include <QtWebEngineWidgets/qwebengineprofile.h>
-#include <QtWebEngineWidgets/qwebenginesettings.h>
 
 #include <httpserver.h>
 #include <httpreqrep.h>
@@ -508,8 +508,8 @@ void tst_QWebEngineUrlRequestInterceptor::requestInterceptorByResourceType_data(
     QTest::addColumn<int>("resourceType");
 
     QStringList name = { "ui", "io" };
-    QVector<InterceptorSetter> setters = { &QWebEngineProfile::setUrlRequestInterceptor,
-                                           &QWebEngineProfile::setRequestInterceptor };
+    QList<InterceptorSetter> setters = { &QWebEngineProfile::setUrlRequestInterceptor,
+                                         &QWebEngineProfile::setRequestInterceptor };
     for (int i = 0; i < 2; i++) {
         QTest::newRow(qPrintable(name[i] + "StyleSheet"))
                 << setters[i] << styleRequestUrl << firstPartyUrl
diff --git a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
index e690bfc11..c0706faaf 100644
--- a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
+++ b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
@@ -58,7 +58,7 @@ void tst_QPdfSearchModel::findText()
 
     QPdfSearchModel model;
     model.setDocument(&document);
-    QVector<QRectF> matches = model.matches(1, "ai");
+    QList<QRectF> matches = model.matches(1, "ai");
 
     qDebug() << matches;
     QCOMPARE(matches.count(), 3);
diff --git a/tests/auto/quick/certificateerror/WebView.qml b/tests/auto/quick/certificateerror/WebView.qml
new file mode 100644
index 000000000..97abdfb98
--- /dev/null
+++ b/tests/auto/quick/certificateerror/WebView.qml
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtWebEngine 1.4
+import QtQuick.Window 2.0
+import QtTest 1.0
+import io.qt.tester 1.0
+
+Window {
+    width: 50
+    height: 50
+    visible: true
+
+    TestHandler {
+        id: handler
+        onLoadPage: function(url) {
+            view.url = url
+        }
+    }
+
+    WebEngineView {
+        id: view
+        anchors.fill: parent
+        onLoadingChanged: function(request) {
+            if (request.status === WebEngineView.LoadSucceededStatus) {
+                handler.loadSuccess = true
+            } else if (request.status === WebEngineView.LoadFailedStatus) {
+                handler.loadSuccess = false
+            }
+        }
+        onCertificateError: function(error) {
+            handler.certificateError = error
+        }
+        Component.onCompleted: {
+            view.settings.errorPageEnabled = false
+        }
+    }
+}
diff --git a/tests/auto/quick/certificateerror/certificateerror.pro b/tests/auto/quick/certificateerror/certificateerror.pro
new file mode 100644
index 000000000..27d5a3cc1
--- /dev/null
+++ b/tests/auto/quick/certificateerror/certificateerror.pro
@@ -0,0 +1,7 @@
+include(../tests.pri)
+include(../../shared/https.pri)
+QT *= webenginecore-private webengine webengine-private
+HEADERS += $$PWD/testhandler.h
+SOURCES += $$PWD/testhandler.cpp
+RESOURCES += certificateerror.qrc
+
diff --git a/tests/auto/quick/certificateerror/certificateerror.qrc b/tests/auto/quick/certificateerror/certificateerror.qrc
new file mode 100644
index 000000000..bfc3013e7
--- /dev/null
+++ b/tests/auto/quick/certificateerror/certificateerror.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>WebView.qml</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/quick/certificateerror/testhandler.cpp b/tests/auto/quick/certificateerror/testhandler.cpp
new file mode 100644
index 000000000..cb6710aa3
--- /dev/null
+++ b/tests/auto/quick/certificateerror/testhandler.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "testhandler.h"
+
+TestHandler::TestHandler(QObject *parent) : QObject(parent)
+{
+    setObjectName(QStringLiteral("TestListner"));
+}
+
+void TestHandler::load(const QUrl &page)
+{
+    emit loadPage(page);
+}
+
+void TestHandler::setLoadSuccess(bool success)
+{
+    if (m_loadSuccess != success) {
+        m_loadSuccess = success;
+        emit loadSuccessChanged();
+    }
+}
+
+bool TestHandler::loadSuccess() const
+{
+    return m_loadSuccess;
+}
+
+QWebEngineCertificateError TestHandler::certificateError() const
+{
+    return *m_error;
+}
+
+void TestHandler::setCertificateError(QWebEngineCertificateError error)
+{
+    m_error = new QWebEngineCertificateError(error);
+    emit certificateErrorChanged();
+}
diff --git a/tests/auto/quick/certificateerror/testhandler.h b/tests/auto/quick/certificateerror/testhandler.h
new file mode 100644
index 000000000..a6d95d9a9
--- /dev/null
+++ b/tests/auto/quick/certificateerror/testhandler.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TESTHANDLER_H
+#define TESTHANDLER_H
+
+#include <QWebEngineCertificateError>
+
+class TestHandler : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QWebEngineCertificateError certificateError READ certificateError WRITE
+                       setCertificateError NOTIFY certificateErrorChanged)
+    Q_PROPERTY(bool loadSuccess READ loadSuccess WRITE setLoadSuccess NOTIFY loadSuccessChanged)
+public:
+    explicit TestHandler(QObject *parent = nullptr);
+    QWebEngineCertificateError certificateError() const;
+
+    void setCertificateError(QWebEngineCertificateError error);
+    void setLoadSuccess(bool success);
+    bool loadSuccess() const;
+    void load(const QUrl &page);
+
+signals:
+    void loadPage(const QUrl &page);
+    void certificateErrorChanged();
+    void loadSuccessChanged();
+
+private:
+    QWebEngineCertificateError *m_error = nullptr;
+    bool m_loadSuccess = false;
+};
+
+#endif // TESTHANDLER_H
diff --git a/tests/auto/quick/certificateerror/tst_certificateerror.cpp b/tests/auto/quick/certificateerror/tst_certificateerror.cpp
new file mode 100644
index 000000000..3e2dc85fb
--- /dev/null
+++ b/tests/auto/quick/certificateerror/tst_certificateerror.cpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testhandler.h"
+#include <httpsserver.h>
+#include <util.h>
+#include <QWebEngineCertificateError>
+#include <QQuickWebEngineProfile>
+#include <QQmlApplicationEngine>
+#include <QQuickWindow>
+#include <QtTest/QtTest>
+
+class tst_CertificateError : public QObject
+{
+    Q_OBJECT
+public:
+    tst_CertificateError() { }
+
+private Q_SLOTS:
+    void initTestCase();
+    void handleError_data();
+    void handleError();
+
+private:
+    QScopedPointer<QQmlApplicationEngine> m_engine;
+    QQuickWindow *m_widnow = nullptr;
+    TestHandler *m_handler = nullptr;
+};
+
+void tst_CertificateError::initTestCase()
+{
+    QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
+    qmlRegisterType<TestHandler>("io.qt.tester", 1, 0, "TestHandler");
+    m_engine.reset(new QQmlApplicationEngine());
+    m_engine->load(QUrl(QStringLiteral("qrc:/WebView.qml")));
+    m_widnow = qobject_cast<QQuickWindow *>(m_engine->rootObjects().first());
+    Q_ASSERT(m_widnow);
+    m_handler = m_widnow->findChild<TestHandler *>(QStringLiteral("TestListner"));
+    Q_ASSERT(m_handler);
+}
+
+void tst_CertificateError::handleError_data()
+{
+    QTest::addColumn<bool>("deferError");
+    QTest::addColumn<bool>("acceptCertificate");
+    QTest::addColumn<QString>("expectedContent");
+    QTest::addRow("Reject") << false << false << QString();
+    QTest::addRow("DeferReject") << true << false << QString();
+    QTest::addRow("DeferAccept") << true << true << "TEST";
+}
+
+void tst_CertificateError::handleError()
+{
+    HttpsServer server;
+    server.setExpectError(true);
+    QVERIFY(server.start());
+
+    connect(&server, &HttpsServer::newRequest, [&](HttpReqRep *rr) {
+        rr->setResponseBody(QByteArrayLiteral("<html><body>TEST</body></html>"));
+        rr->sendResponse();
+    });
+
+    QFETCH(bool, deferError);
+    QFETCH(bool, acceptCertificate);
+    QFETCH(QString, expectedContent);
+
+    QSignalSpy certificateErrorSpy(m_handler, &TestHandler::certificateErrorChanged);
+    m_handler->load(server.url());
+    QTRY_COMPARE(certificateErrorSpy.count(), 1);
+    QWebEngineCertificateError error = m_handler->certificateError();
+
+    if (deferError) {
+        error.defer();
+        return;
+    }
+
+    if (acceptCertificate)
+        error.acceptCertificate();
+    else
+        error.rejectCertificate();
+
+    QVERIFY(error.isOverridable());
+    auto chain = error.certificateChain();
+    QCOMPARE(chain.size(), 2);
+    QCOMPARE(chain[0].serialNumber(), "3b:dd:1a:b7:2f:40:32:3b:c1:bf:37:d4:86:bd:56:c1:d0:6b:2a:43");
+    QCOMPARE(chain[1].serialNumber(), "6d:52:fb:b4:57:3b:b2:03:c8:62:7b:7e:44:45:5c:d3:08:87:74:17");
+
+    if (deferError) {
+      QVERIFY(!m_handler->loadSuccess());
+
+      if (acceptCertificate)
+          error.acceptCertificate();
+      else
+          error.rejectCertificate();
+    }
+    QTRY_COMPARE_WITH_TIMEOUT(m_handler->loadSuccess(), acceptCertificate, 3000);
+}
+
+static QByteArrayList params;
+W_QTEST_MAIN(tst_CertificateError, params)
+#include <tst_certificateerror.moc>
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp
index 8e802a836..dca872aad 100644
--- a/tests/auto/quick/dialogs/tst_dialogs.cpp
+++ b/tests/auto/quick/dialogs/tst_dialogs.cpp
@@ -30,7 +30,7 @@
 #include "server.h"
 #include "util.h"
 #include <QtWebEngine/private/qquickwebenginedialogrequests_p.h>
-#include <QtWebEngine/private/qquickwebenginecontextmenurequest_p.h>
+#include <QtWebEngineCore/qwebenginecontextmenurequest.h>
 #include <QQuickWebEngineProfile>
 #include <QQmlApplicationEngine>
 #include <QQuickWindow>
@@ -121,7 +121,7 @@ void tst_Dialogs::contextMenuRequested()
     QSignalSpy dialogSpy(m_listner, &TestHandler::requestChanged);
     QTest::mouseClick(m_widnow, Qt::RightButton);
     QTRY_COMPARE(dialogSpy.count(), 1);
-    auto dialog = qobject_cast<QQuickWebEngineContextMenuRequest*>(m_listner->request());
+    auto dialog = qobject_cast<QWebEngineContextMenuRequest *>(m_listner->request());
     QVERIFY2(dialog, "Incorrect dialog requested");
 }
 
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 85257fcb7..1f30fce5b 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -105,8 +105,15 @@ inline QQuickWebEngineView* tst_InspectorServer::webView() const
 QJsonArray tst_InspectorServer::fetchPageList() const
 {
     QNetworkAccessManager qnam;
-    QScopedPointer<QNetworkReply> reply(qnam.get(QNetworkRequest(s_inspectorServerHttpBaseUrl.resolved(QUrl("json/list")))));
-    QSignalSpy(reply.data(), SIGNAL(finished())).wait();
+    QSignalSpy spy(&qnam, &QNetworkAccessManager::finished);;
+    QNetworkRequest request(s_inspectorServerHttpBaseUrl.resolved(QUrl("json/list")));
+    QScopedPointer<QNetworkReply> reply(qnam.get(request));
+    spy.wait();
+    // Work-around a network bug in Qt6:
+    if (reply->error() == QNetworkReply::ContentNotFoundError) {
+        reply.reset(qnam.get(request));
+        spy.wait();
+    }
     return QJsonDocument::fromJson(reply->readAll()).array();
 }
 
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index dad962576..e79ed86de 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -34,24 +34,25 @@
 #include <QQmlListProperty>
 #include <QtTest/QtTest>
 #include <QtWebEngine/QQuickWebEngineProfile>
-#include <QtWebEngine/QQuickWebEngineScript>
+#include <QtWebEngineCore/QWebEngineCertificateError>
 #include <QtWebEngineCore/QWebEngineFindTextResult>
+#include <QtWebEngineCore/QWebEngineFullScreenRequest>
 #include <QtWebEngineCore/QWebEngineNotification>
 #include <QtWebEngineCore/QWebEngineQuotaRequest>
 #include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest>
+#include <QtWebEngineCore/QWebEngineContextMenuRequest>
+#include <QtWebEngineCore/QWebEngineDownloadRequest>
+#include <QtWebEngineCore/QWebEngineScript>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebengineaction_p.h>
-#include <private/qquickwebenginecertificateerror_p.h>
 #include <private/qquickwebengineclientcertificateselection_p.h>
 #include <private/qquickwebenginedialogrequests_p.h>
-#include <private/qquickwebenginedownloaditem_p.h>
 #include <private/qquickwebenginehistory_p.h>
 #include <private/qquickwebengineloadrequest_p.h>
 #include <private/qquickwebenginenavigationrequest_p.h>
 #include <private/qquickwebenginenewviewrequest_p.h>
 #include <private/qquickwebenginesettings_p.h>
 #include <private/qquickwebenginesingleton_p.h>
-#include <private/qquickwebenginecontextmenurequest_p.h>
 
 class tst_publicapi : public QObject {
     Q_OBJECT
@@ -62,19 +63,18 @@ private Q_SLOTS:
 static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>()
     << &QQuickWebEngineView::staticMetaObject
     << &QQuickWebEngineAction::staticMetaObject
-    << &QQuickWebEngineCertificateError::staticMetaObject
     << &QQuickWebEngineClientCertificateOption::staticMetaObject
     << &QQuickWebEngineClientCertificateSelection::staticMetaObject
-    << &QQuickWebEngineDownloadItem::staticMetaObject
+    << &QWebEngineDownloadRequest::staticMetaObject
     << &QQuickWebEngineHistory::staticMetaObject
     << &QQuickWebEngineHistoryListModel::staticMetaObject
     << &QQuickWebEngineLoadRequest::staticMetaObject
     << &QQuickWebEngineNavigationRequest::staticMetaObject
     << &QQuickWebEngineNewViewRequest::staticMetaObject
     << &QQuickWebEngineProfile::staticMetaObject
-    << &QQuickWebEngineScript::staticMetaObject
     << &QQuickWebEngineSettings::staticMetaObject
-    << &QQuickWebEngineFullScreenRequest::staticMetaObject
+    << &QWebEngineFullScreenRequest::staticMetaObject
+    << &QWebEngineScript::staticMetaObject
     << &QQuickWebEngineSingleton::staticMetaObject
     << &QQuickWebEngineAuthenticationDialogRequest::staticMetaObject
     << &QQuickWebEngineJavaScriptDialogRequest::staticMetaObject
@@ -82,7 +82,8 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *
     << &QQuickWebEngineFileDialogRequest::staticMetaObject
     << &QQuickWebEngineFormValidationMessageRequest::staticMetaObject
     << &QQuickWebEngineTooltipRequest::staticMetaObject
-    << &QQuickWebEngineContextMenuRequest::staticMetaObject
+    << &QWebEngineContextMenuRequest::staticMetaObject
+    << &QWebEngineCertificateError::staticMetaObject
     << &QWebEngineQuotaRequest::staticMetaObject
     << &QWebEngineRegisterProtocolHandlerRequest::staticMetaObject
     << &QWebEngineNotification::staticMetaObject
@@ -93,7 +94,7 @@ static QList<const char *> knownEnumNames = QList<const char *>();
 
 static const QStringList hardcodedTypes = QStringList()
     << "QJSValue"
-    << "QQmlListProperty<QQuickWebEngineScript>"
+    << "QQmlListProperty<QWebEngineScript>"
     << "QQmlListProperty<QQuickWebEngineClientCertificateOption>"
     << "const QQuickWebEngineClientCertificateOption*"
     << "QQmlWebChannel*"
@@ -103,7 +104,7 @@ static const QStringList hardcodedTypes = QStringList()
     << "const QQuickWebEngineContextMenuData*"
     << "QWebEngineCookieStore*"
     << "Qt::LayoutDirection"
-    ;
+    << "QQuickWebEngineScriptCollection*";
 
 static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineAction.text --> QString"
@@ -121,29 +122,31 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineAuthenticationDialogRequest.realm --> QString"
     << "QQuickWebEngineAuthenticationDialogRequest.type --> AuthenticationType"
     << "QQuickWebEngineAuthenticationDialogRequest.url --> QUrl"
-    << "QQuickWebEngineCertificateError.CertificateAuthorityInvalid --> Error"
-    << "QQuickWebEngineCertificateError.CertificateCommonNameInvalid --> Error"
-    << "QQuickWebEngineCertificateError.CertificateContainsErrors --> Error"
-    << "QQuickWebEngineCertificateError.CertificateDateInvalid --> Error"
-    << "QQuickWebEngineCertificateError.CertificateInvalid --> Error"
-    << "QQuickWebEngineCertificateError.CertificateKnownInterceptionBlocked --> Error"
-    << "QQuickWebEngineCertificateError.CertificateNameConstraintViolation --> Error"
-    << "QQuickWebEngineCertificateError.CertificateNoRevocationMechanism --> Error"
-    << "QQuickWebEngineCertificateError.CertificateNonUniqueName --> Error"
-    << "QQuickWebEngineCertificateError.CertificateRevoked --> Error"
-    << "QQuickWebEngineCertificateError.CertificateTransparencyRequired --> Error"
-    << "QQuickWebEngineCertificateError.CertificateUnableToCheckRevocation --> Error"
-    << "QQuickWebEngineCertificateError.CertificateValidityTooLong --> Error"
-    << "QQuickWebEngineCertificateError.CertificateWeakKey --> Error"
-    << "QQuickWebEngineCertificateError.CertificateWeakSignatureAlgorithm --> Error"
-    << "QQuickWebEngineCertificateError.SslPinnedKeyNotInCertificateChain --> Error"
-    << "QQuickWebEngineCertificateError.defer() --> void"
-    << "QQuickWebEngineCertificateError.description --> QString"
-    << "QQuickWebEngineCertificateError.error --> Error"
-    << "QQuickWebEngineCertificateError.ignoreCertificateError() --> void"
-    << "QQuickWebEngineCertificateError.overridable --> bool"
-    << "QQuickWebEngineCertificateError.rejectCertificate() --> void"
-    << "QQuickWebEngineCertificateError.url --> QUrl"
+    << "QWebEngineCertificateError.CertificateAuthorityInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateCommonNameInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateContainsErrors --> Type"
+    << "QWebEngineCertificateError.CertificateDateInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateInvalid --> Type"
+    << "QWebEngineCertificateError.CertificateKnownInterceptionBlocked --> Type"
+    << "QWebEngineCertificateError.CertificateNameConstraintViolation --> Type"
+    << "QWebEngineCertificateError.CertificateNoRevocationMechanism --> Type"
+    << "QWebEngineCertificateError.CertificateNonUniqueName --> Type"
+    << "QWebEngineCertificateError.CertificateRevoked --> Type"
+    << "QWebEngineCertificateError.CertificateTransparencyRequired --> Type"
+    << "QWebEngineCertificateError.CertificateUnableToCheckRevocation --> Type"
+    << "QWebEngineCertificateError.CertificateValidityTooLong --> Type"
+    << "QWebEngineCertificateError.CertificateWeakKey --> Type"
+    << "QWebEngineCertificateError.CertificateWeakSignatureAlgorithm --> Type"
+    << "QWebEngineCertificateError.CertificateSymantecLegacy --> Type"
+    << "QWebEngineCertificateError.SslObsoleteVersion --> Type"
+    << "QWebEngineCertificateError.SslPinnedKeyNotInCertificateChain --> Type"
+    << "QWebEngineCertificateError.defer() --> void"
+    << "QWebEngineCertificateError.description --> QString"
+    << "QWebEngineCertificateError.type --> Type"
+    << "QWebEngineCertificateError.acceptCertificate() --> void"
+    << "QWebEngineCertificateError.overridable --> bool"
+    << "QWebEngineCertificateError.rejectCertificate() --> void"
+    << "QWebEngineCertificateError.url --> QUrl"
     << "QQuickWebEngineClientCertificateOption.issuer --> QString"
     << "QQuickWebEngineClientCertificateOption.subject --> QString"
     << "QQuickWebEngineClientCertificateOption.effectiveDate --> QDateTime"
@@ -157,118 +160,109 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineClientCertificateSelection.selectNone() --> void"
     << "QQuickWebEngineColorDialogRequest.accepted --> bool"
     << "QQuickWebEngineColorDialogRequest.color --> QColor"
-    << "QQuickWebEngineContextMenuRequest.CanUndo --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanRedo --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanCut --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanCopy --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanPaste --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanDelete --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanSelectAll --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanTranslate --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.CanEditRichly --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanUndo --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanRedo --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanCut --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanCopy --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanPaste --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanDelete --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanSelectAll --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanTranslate --> EditFlags"
+    << "QWebEngineContextMenuRequest.CanEditRichly --> EditFlags"
     << "QQuickWebEngineColorDialogRequest.dialogAccept(QColor) --> void"
     << "QQuickWebEngineColorDialogRequest.dialogReject() --> void"
-    << "QQuickWebEngineContextMenuRequest.editFlags --> EditFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaInError --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaPaused --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaMuted --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaLoop --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaCanSave --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaHasAudio --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaCanToggleControls --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaControls --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaCanPrint --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaCanRotate --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.MediaTypeAudio --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.MediaTypeCanvas --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.MediaTypeFile --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.MediaTypeImage --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.MediaTypeNone --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.MediaTypePlugin --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.MediaTypeVideo --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.accepted --> bool"
-    << "QQuickWebEngineContextMenuRequest.isContentEditable --> bool"
-    << "QQuickWebEngineContextMenuRequest.linkText --> QString"
-    << "QQuickWebEngineContextMenuRequest.linkUrl --> QUrl"
-    << "QQuickWebEngineContextMenuRequest.mediaFlags --> MediaFlags"
-    << "QQuickWebEngineContextMenuRequest.mediaType --> MediaType"
-    << "QQuickWebEngineContextMenuRequest.mediaUrl --> QUrl"
-    << "QQuickWebEngineContextMenuRequest.misspelledWord --> QString"
-    << "QQuickWebEngineContextMenuRequest.selectedText --> QString"
-    << "QQuickWebEngineContextMenuRequest.spellCheckerSuggestions --> QStringList"
-    << "QQuickWebEngineContextMenuRequest.x --> int"
-    << "QQuickWebEngineContextMenuRequest.y --> int"
-    << "QQuickWebEngineDownloadItem.Attachment --> DownloadType"
-    << "QQuickWebEngineDownloadItem.CompleteHtmlSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.DownloadAttribute --> DownloadType"
-    << "QQuickWebEngineDownloadItem.DownloadCancelled --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadCompleted --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadInProgress --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadInterrupted --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadRequested --> DownloadState"
-    << "QQuickWebEngineDownloadItem.FileAccessDenied --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileBlocked --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileHashMismatch --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileNameTooLong --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileNoSpace --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileSecurityCheckFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileTooLarge --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileTooShort --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileTransientError --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileVirusInfected --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.MimeHtmlSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.NetworkDisconnected --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkInvalidRequest --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkServerDown --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkTimeout --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NoReason --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.SavePage --> DownloadType"
-    << "QQuickWebEngineDownloadItem.ServerBadContent --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerCertProblem --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerForbidden --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerUnauthorized --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerUnreachable --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.SingleHtmlSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.UnknownSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.UserCanceled --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.UserRequested --> DownloadType"
-    << "QQuickWebEngineDownloadItem.accept() --> void"
-    << "QQuickWebEngineDownloadItem.cancel() --> void"
-    << "QQuickWebEngineDownloadItem.id --> uint"
-    << "QQuickWebEngineDownloadItem.interruptReason --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.interruptReasonChanged() --> void"
-    << "QQuickWebEngineDownloadItem.interruptReasonString --> QString"
-    << "QQuickWebEngineDownloadItem.isFinished --> bool"
-    << "QQuickWebEngineDownloadItem.isFinishedChanged() --> void"
-    << "QQuickWebEngineDownloadItem.isPaused --> bool"
-    << "QQuickWebEngineDownloadItem.isPausedChanged() --> void"
-    << "QQuickWebEngineDownloadItem.isSavePageDownload --> bool"
-    << "QQuickWebEngineDownloadItem.mimeType --> QString"
-    << "QQuickWebEngineDownloadItem.mimeTypeChanged() --> void"
-    << "QQuickWebEngineDownloadItem.path --> QString"
-    << "QQuickWebEngineDownloadItem.pathChanged() --> void"
-    << "QQuickWebEngineDownloadItem.pause() --> void"
-    << "QQuickWebEngineDownloadItem.receivedBytes --> qlonglong"
-    << "QQuickWebEngineDownloadItem.receivedBytesChanged() --> void"
-    << "QQuickWebEngineDownloadItem.resume() --> void"
-    << "QQuickWebEngineDownloadItem.savePageFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.savePageFormatChanged() --> void"
-    << "QQuickWebEngineDownloadItem.state --> DownloadState"
-    << "QQuickWebEngineDownloadItem.stateChanged() --> void"
-    << "QQuickWebEngineDownloadItem.totalBytes --> qlonglong"
-    << "QQuickWebEngineDownloadItem.totalBytesChanged() --> void"
-    << "QQuickWebEngineDownloadItem.type --> DownloadType"
-    << "QQuickWebEngineDownloadItem.typeChanged() --> void"
-    << "QQuickWebEngineDownloadItem.view --> QQuickWebEngineView*"
-    << "QQuickWebEngineDownloadItem.url --> QUrl"
-    << "QQuickWebEngineDownloadItem.suggestedFileName --> QString"
-    << "QQuickWebEngineDownloadItem.downloadDirectory --> QString"
-    << "QQuickWebEngineDownloadItem.downloadDirectoryChanged() --> void"
-    << "QQuickWebEngineDownloadItem.downloadFileName --> QString"
-    << "QQuickWebEngineDownloadItem.downloadFileNameChanged() --> void"
+    << "QWebEngineContextMenuRequest.editFlags --> EditFlags"
+    << "QWebEngineContextMenuRequest.MediaInError --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaPaused --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaMuted --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaLoop --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaCanSave --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaHasAudio --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaCanToggleControls --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaControls --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaCanPrint --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaCanRotate --> MediaFlags"
+    << "QWebEngineContextMenuRequest.MediaTypeAudio --> MediaType"
+    << "QWebEngineContextMenuRequest.MediaTypeCanvas --> MediaType"
+    << "QWebEngineContextMenuRequest.MediaTypeFile --> MediaType"
+    << "QWebEngineContextMenuRequest.MediaTypeImage --> MediaType"
+    << "QWebEngineContextMenuRequest.MediaTypeNone --> MediaType"
+    << "QWebEngineContextMenuRequest.MediaTypePlugin --> MediaType"
+    << "QWebEngineContextMenuRequest.MediaTypeVideo --> MediaType"
+    << "QWebEngineContextMenuRequest.accepted --> bool"
+    << "QWebEngineContextMenuRequest.isContentEditable --> bool"
+    << "QWebEngineContextMenuRequest.linkText --> QString"
+    << "QWebEngineContextMenuRequest.linkUrl --> QUrl"
+    << "QWebEngineContextMenuRequest.mediaFlags --> MediaFlags"
+    << "QWebEngineContextMenuRequest.mediaType --> MediaType"
+    << "QWebEngineContextMenuRequest.mediaUrl --> QUrl"
+    << "QWebEngineContextMenuRequest.misspelledWord --> QString"
+    << "QWebEngineContextMenuRequest.selectedText --> QString"
+    << "QWebEngineContextMenuRequest.spellCheckerSuggestions --> QStringList"
+    << "QWebEngineContextMenuRequest.position --> QPoint"
+    << "QWebEngineDownloadRequest.CompleteHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.DownloadCancelled --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadCompleted --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadInProgress --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadInterrupted --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadRequested --> DownloadState"
+    << "QWebEngineDownloadRequest.FileAccessDenied --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileBlocked --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileHashMismatch --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileNameTooLong --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileNoSpace --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileSecurityCheckFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileTooLarge --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileTooShort --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileTransientError --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileVirusInfected --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.MimeHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.NetworkDisconnected --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkInvalidRequest --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkServerDown --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkTimeout --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NoReason --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerBadContent --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerCertProblem --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerForbidden --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerUnauthorized --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerUnreachable --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.SingleHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.UnknownSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.UserCanceled --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.accept() --> void"
+    << "QWebEngineDownloadRequest.cancel() --> void"
+    << "QWebEngineDownloadRequest.id --> uint"
+    << "QWebEngineDownloadRequest.interruptReason --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.interruptReasonChanged() --> void"
+    << "QWebEngineDownloadRequest.interruptReasonString --> QString"
+    << "QWebEngineDownloadRequest.isFinished --> bool"
+    << "QWebEngineDownloadRequest.isFinishedChanged() --> void"
+    << "QWebEngineDownloadRequest.isPaused --> bool"
+    << "QWebEngineDownloadRequest.isPausedChanged() --> void"
+    << "QWebEngineDownloadRequest.isSavePageDownload --> bool"
+    << "QWebEngineDownloadRequest.mimeType --> QString"
+    << "QWebEngineDownloadRequest.pause() --> void"
+    << "QWebEngineDownloadRequest.receivedBytes --> qlonglong"
+    << "QWebEngineDownloadRequest.receivedBytesChanged() --> void"
+    << "QWebEngineDownloadRequest.resume() --> void"
+    << "QWebEngineDownloadRequest.savePageFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.savePageFormatChanged() --> void"
+    << "QWebEngineDownloadRequest.state --> DownloadState"
+    << "QWebEngineDownloadRequest.stateChanged(QWebEngineDownloadRequest::DownloadState) --> void"
+    << "QWebEngineDownloadRequest.totalBytes --> qlonglong"
+    << "QWebEngineDownloadRequest.totalBytesChanged() --> void"
+    // FIXME << "QWebEngineDownloadRequest.view --> QQuickWebEngineView*"
+    << "QWebEngineDownloadRequest.url --> QUrl"
+    << "QWebEngineDownloadRequest.suggestedFileName --> QString"
+    << "QWebEngineDownloadRequest.downloadDirectory --> QString"
+    << "QWebEngineDownloadRequest.downloadDirectoryChanged() --> void"
+    << "QWebEngineDownloadRequest.downloadFileName --> QString"
+    << "QWebEngineDownloadRequest.downloadFileNameChanged() --> void"
+    << "QWebEngineDownloadRequest.downloadProgress(qlonglong,qlonglong) --> void" // FIXME
     << "QQuickWebEngineFileDialogRequest.FileModeOpen --> FileMode"
     << "QQuickWebEngineFileDialogRequest.FileModeOpenMultiple --> FileMode"
     << "QQuickWebEngineFileDialogRequest.FileModeSave --> FileMode"
@@ -296,10 +290,10 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineTooltipRequest.text --> QString"
     << "QQuickWebEngineTooltipRequest.type --> RequestType"
     << "QQuickWebEngineTooltipRequest.accepted --> bool"
-    << "QQuickWebEngineFullScreenRequest.accept() --> void"
-    << "QQuickWebEngineFullScreenRequest.origin --> QUrl"
-    << "QQuickWebEngineFullScreenRequest.reject() --> void"
-    << "QQuickWebEngineFullScreenRequest.toggleOn --> bool"
+    << "QWebEngineFullScreenRequest.accept() --> void"
+    << "QWebEngineFullScreenRequest.origin --> QUrl"
+    << "QWebEngineFullScreenRequest.reject() --> void"
+    << "QWebEngineFullScreenRequest.toggleOn --> bool"
     << "QQuickWebEngineHistory.backItems --> QQuickWebEngineHistoryListModel*"
     << "QQuickWebEngineHistory.clear() --> void"
     << "QQuickWebEngineHistory.forwardItems --> QQuickWebEngineHistoryListModel*"
@@ -340,8 +334,8 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineProfile.cachePath --> QString"
     << "QQuickWebEngineProfile.cachePathChanged() --> void"
     << "QQuickWebEngineProfile.clearHttpCache() --> void"
-    << "QQuickWebEngineProfile.downloadFinished(QQuickWebEngineDownloadItem*) --> void"
-    << "QQuickWebEngineProfile.downloadRequested(QQuickWebEngineDownloadItem*) --> void"
+    << "QQuickWebEngineProfile.downloadFinished(QWebEngineDownloadRequest*) --> void"
+    << "QQuickWebEngineProfile.downloadRequested(QWebEngineDownloadRequest*) --> void"
     << "QQuickWebEngineProfile.downloadPath --> QString"
     << "QQuickWebEngineProfile.downloadPathChanged() --> void"
     << "QQuickWebEngineProfile.presentNotification(QWebEngineNotification*) --> void"
@@ -367,32 +361,7 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineProfile.storageNameChanged() --> void"
     << "QQuickWebEngineProfile.useForGlobalCertificateVerification --> bool"
     << "QQuickWebEngineProfile.useForGlobalCertificateVerificationChanged() --> void"
-    << "QQuickWebEngineProfile.userScripts --> QQmlListProperty<QQuickWebEngineScript>"
-    << "QQuickWebEngineScript.ApplicationWorld --> ScriptWorldId"
-    << "QQuickWebEngineScript.Deferred --> InjectionPoint"
-    << "QQuickWebEngineScript.DocumentCreation --> InjectionPoint"
-    << "QQuickWebEngineScript.DocumentReady --> InjectionPoint"
-    << "QQuickWebEngineScript.MainWorld --> ScriptWorldId"
-    << "QQuickWebEngineScript.UserWorld --> ScriptWorldId"
-    << "QQuickWebEngineScript.injectionPoint --> InjectionPoint"
-    << "QQuickWebEngineScript.injectionPointChanged(InjectionPoint) --> void"
-    << "QQuickWebEngineScript.name --> QString"
-    << "QQuickWebEngineScript.nameChanged(QString) --> void"
-    << "QQuickWebEngineScript.runOnSubframes --> bool"
-    << "QQuickWebEngineScript.runOnSubframesChanged(bool) --> void"
-    << "QQuickWebEngineScript.setInjectionPoint(InjectionPoint) --> void"
-    << "QQuickWebEngineScript.setName(QString) --> void"
-    << "QQuickWebEngineScript.setRunOnSubframes(bool) --> void"
-    << "QQuickWebEngineScript.setSourceCode(QString) --> void"
-    << "QQuickWebEngineScript.setSourceUrl(QUrl) --> void"
-    << "QQuickWebEngineScript.setWorldId(ScriptWorldId) --> void"
-    << "QQuickWebEngineScript.sourceCode --> QString"
-    << "QQuickWebEngineScript.sourceCodeChanged(QString) --> void"
-    << "QQuickWebEngineScript.sourceUrl --> QUrl"
-    << "QQuickWebEngineScript.sourceUrlChanged(QUrl) --> void"
-    << "QQuickWebEngineScript.toString() --> QString"
-    << "QQuickWebEngineScript.worldId --> ScriptWorldId"
-    << "QQuickWebEngineScript.worldIdChanged(ScriptWorldId) --> void"
+    << "QQuickWebEngineProfile.userScripts --> QQuickWebEngineScriptCollection*"
     << "QQuickWebEngineSettings.AllowAllUnknownUrlSchemes --> UnknownUrlSchemePolicy"
     << "QQuickWebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction --> UnknownUrlSchemePolicy"
     << "QQuickWebEngineSettings.DisallowUnknownUrlSchemes --> UnknownUrlSchemePolicy"
@@ -460,6 +429,19 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineSettings.webRTCPublicInterfacesOnlyChanged() --> void"
     << "QQuickWebEngineSingleton.defaultProfile --> QQuickWebEngineProfile*"
     << "QQuickWebEngineSingleton.settings --> QQuickWebEngineSettings*"
+    << "QQuickWebEngineSingleton.script() --> QWebEngineScript"
+    << "QWebEngineScript.ApplicationWorld --> ScriptWorldId"
+    << "QWebEngineScript.Deferred --> InjectionPoint"
+    << "QWebEngineScript.DocumentCreation --> InjectionPoint"
+    << "QWebEngineScript.DocumentReady --> InjectionPoint"
+    << "QWebEngineScript.MainWorld --> ScriptWorldId"
+    << "QWebEngineScript.UserWorld --> ScriptWorldId"
+    << "QWebEngineScript.injectionPoint --> InjectionPoint"
+    << "QWebEngineScript.name --> QString"
+    << "QWebEngineScript.runsOnSubFrames --> bool"
+    << "QWebEngineScript.sourceCode --> QString"
+    << "QWebEngineScript.sourceUrl --> QUrl"
+    << "QWebEngineScript.worldId --> uint"
     << "QQuickWebEngineView.action(WebAction) --> QQuickWebEngineAction*"
     << "QQuickWebEngineView.A0 --> PrintedPageSizeId"
     << "QQuickWebEngineView.A1 --> PrintedPageSizeId"
@@ -688,11 +670,11 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.backgroundColorChanged() --> void"
     << "QQuickWebEngineView.canGoBack --> bool"
     << "QQuickWebEngineView.canGoForward --> bool"
-    << "QQuickWebEngineView.certificateError(QQuickWebEngineCertificateError*) --> void"
+    << "QQuickWebEngineView.certificateError(QWebEngineCertificateError) --> void"
     << "QQuickWebEngineView.colorDialogRequested(QQuickWebEngineColorDialogRequest*) --> void"
     << "QQuickWebEngineView.contentsSize --> QSizeF"
     << "QQuickWebEngineView.contentsSizeChanged(QSizeF) --> void"
-    << "QQuickWebEngineView.contextMenuRequested(QQuickWebEngineContextMenuRequest*) --> void"
+    << "QQuickWebEngineView.contextMenuRequested(QWebEngineContextMenuRequest*) --> void"
     << "QQuickWebEngineView.devToolsView --> QQuickWebEngineView*"
     << "QQuickWebEngineView.devToolsViewChanged() --> void"
     << "QQuickWebEngineView.featurePermissionRequested(QUrl,Feature) --> void"
@@ -703,7 +685,7 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.findTextFinished(QWebEngineFindTextResult) --> void"
     << "QQuickWebEngineView.formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest*) --> void"
     << "QQuickWebEngineView.fullScreenCancelled() --> void"
-    << "QQuickWebEngineView.fullScreenRequested(QQuickWebEngineFullScreenRequest) --> void"
+    << "QQuickWebEngineView.fullScreenRequested(QWebEngineFullScreenRequest) --> void"
     << "QQuickWebEngineView.geometryChangeRequested(QRect,QRect) --> void"
     << "QQuickWebEngineView.goBack() --> void"
     << "QQuickWebEngineView.goBackOrForward(int) --> void"
@@ -771,8 +753,10 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.triggerWebAction(WebAction) --> void"
     << "QQuickWebEngineView.url --> QUrl"
     << "QQuickWebEngineView.urlChanged() --> void"
-    << "QQuickWebEngineView.userScripts --> QQmlListProperty<QQuickWebEngineScript>"
+    << "QQuickWebEngineView.userScripts --> QQuickWebEngineScriptCollection*"
+#if QT_CONFIG(webengine_webchannel)
     << "QQuickWebEngineView.webChannel --> QQmlWebChannel*"
+#endif
     << "QQuickWebEngineView.webChannelChanged() --> void"
     << "QQuickWebEngineView.webChannelWorld --> uint"
     << "QQuickWebEngineView.webChannelWorldChanged(uint) --> void"
diff --git a/tests/auto/quick/qmltests2/data/accepttypes.html b/tests/auto/quick/qmltests/data/accepttypes.html
index aff39f96e..aff39f96e 100644
--- a/tests/auto/quick/qmltests2/data/accepttypes.html
+++ b/tests/auto/quick/qmltests/data/accepttypes.html
diff --git a/tests/auto/quick/qmltests2/data/alert.html b/tests/auto/quick/qmltests/data/alert.html
index 89715a727..89715a727 100644
--- a/tests/auto/quick/qmltests2/data/alert.html
+++ b/tests/auto/quick/qmltests/data/alert.html
diff --git a/tests/auto/quick/qmltests2/data/confirm.html b/tests/auto/quick/qmltests/data/confirm.html
index a4fc5b532..a4fc5b532 100644
--- a/tests/auto/quick/qmltests2/data/confirm.html
+++ b/tests/auto/quick/qmltests/data/confirm.html
diff --git a/tests/auto/quick/qmltests2/data/confirmclose.html b/tests/auto/quick/qmltests/data/confirmclose.html
index c2acbb67f..c2acbb67f 100644
--- a/tests/auto/quick/qmltests2/data/confirmclose.html
+++ b/tests/auto/quick/qmltests/data/confirmclose.html
diff --git a/tests/auto/quick/qmltests2/data/directoryupload.html b/tests/auto/quick/qmltests/data/directoryupload.html
index adc408ebb..adc408ebb 100644
--- a/tests/auto/quick/qmltests2/data/directoryupload.html
+++ b/tests/auto/quick/qmltests/data/directoryupload.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-candidates-gray.html b/tests/auto/quick/qmltests/data/favicon-candidates-gray.html
index ebea35b02..ebea35b02 100644
--- a/tests/auto/quick/qmltests2/data/favicon-candidates-gray.html
+++ b/tests/auto/quick/qmltests/data/favicon-candidates-gray.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-misc.html b/tests/auto/quick/qmltests/data/favicon-misc.html
index 9e788bdf4..9e788bdf4 100644
--- a/tests/auto/quick/qmltests2/data/favicon-misc.html
+++ b/tests/auto/quick/qmltests/data/favicon-misc.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-multi-gray.html b/tests/auto/quick/qmltests/data/favicon-multi-gray.html
index 24b71640f..24b71640f 100644
--- a/tests/auto/quick/qmltests2/data/favicon-multi-gray.html
+++ b/tests/auto/quick/qmltests/data/favicon-multi-gray.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-multi.html b/tests/auto/quick/qmltests/data/favicon-multi.html
index cc5f3fd66..cc5f3fd66 100644
--- a/tests/auto/quick/qmltests2/data/favicon-multi.html
+++ b/tests/auto/quick/qmltests/data/favicon-multi.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-shortcut.html b/tests/auto/quick/qmltests/data/favicon-shortcut.html
index 786cdb816..786cdb816 100644
--- a/tests/auto/quick/qmltests2/data/favicon-shortcut.html
+++ b/tests/auto/quick/qmltests/data/favicon-shortcut.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-single.html b/tests/auto/quick/qmltests/data/favicon-single.html
index eb4675c75..eb4675c75 100644
--- a/tests/auto/quick/qmltests2/data/favicon-single.html
+++ b/tests/auto/quick/qmltests/data/favicon-single.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-touch.html b/tests/auto/quick/qmltests/data/favicon-touch.html
index 271783434..271783434 100644
--- a/tests/auto/quick/qmltests2/data/favicon-touch.html
+++ b/tests/auto/quick/qmltests/data/favicon-touch.html
diff --git a/tests/auto/quick/qmltests2/data/favicon-unavailable.html b/tests/auto/quick/qmltests/data/favicon-unavailable.html
index c45664294..c45664294 100644
--- a/tests/auto/quick/qmltests2/data/favicon-unavailable.html
+++ b/tests/auto/quick/qmltests/data/favicon-unavailable.html
diff --git a/tests/auto/quick/qmltests2/data/favicon2.html b/tests/auto/quick/qmltests/data/favicon2.html
index 81c2690fe..81c2690fe 100644
--- a/tests/auto/quick/qmltests2/data/favicon2.html
+++ b/tests/auto/quick/qmltests/data/favicon2.html
diff --git a/tests/auto/quick/qmltests2/data/icons/gray128.png b/tests/auto/quick/qmltests/data/icons/gray128.png
index bf1cfaba0..bf1cfaba0 100644
--- a/tests/auto/quick/qmltests2/data/icons/gray128.png
+++ b/tests/auto/quick/qmltests/data/icons/gray128.png
diff --git a/tests/auto/quick/qmltests2/data/icons/gray16.png b/tests/auto/quick/qmltests/data/icons/gray16.png
index 2a1a91a76..2a1a91a76 100644
--- a/tests/auto/quick/qmltests2/data/icons/gray16.png
+++ b/tests/auto/quick/qmltests/data/icons/gray16.png
diff --git a/tests/auto/quick/qmltests2/data/icons/gray255.png b/tests/auto/quick/qmltests/data/icons/gray255.png
index 549169551..549169551 100644
--- a/tests/auto/quick/qmltests2/data/icons/gray255.png
+++ b/tests/auto/quick/qmltests/data/icons/gray255.png
diff --git a/tests/auto/quick/qmltests2/data/icons/gray32.png b/tests/auto/quick/qmltests/data/icons/gray32.png
index b269a528f..b269a528f 100644
--- a/tests/auto/quick/qmltests2/data/icons/gray32.png
+++ b/tests/auto/quick/qmltests/data/icons/gray32.png
diff --git a/tests/auto/quick/qmltests2/data/icons/gray64.png b/tests/auto/quick/qmltests/data/icons/gray64.png
index e02559e5b..e02559e5b 100644
--- a/tests/auto/quick/qmltests2/data/icons/gray64.png
+++ b/tests/auto/quick/qmltests/data/icons/gray64.png
diff --git a/tests/auto/quick/qmltests2/data/icons/grayicons.ico b/tests/auto/quick/qmltests/data/icons/grayicons.ico
index 8d8fee839..8d8fee839 100644
--- a/tests/auto/quick/qmltests2/data/icons/grayicons.ico
+++ b/tests/auto/quick/qmltests/data/icons/grayicons.ico
diff --git a/tests/auto/quick/qmltests2/data/icons/qt144.png b/tests/auto/quick/qmltests/data/icons/qt144.png
index 050b1e066..050b1e066 100644
--- a/tests/auto/quick/qmltests2/data/icons/qt144.png
+++ b/tests/auto/quick/qmltests/data/icons/qt144.png
diff --git a/tests/auto/quick/qmltests2/data/icons/qt32.ico b/tests/auto/quick/qmltests/data/icons/qt32.ico
index 2f6fcb5bc..2f6fcb5bc 100644
--- a/tests/auto/quick/qmltests2/data/icons/qt32.ico
+++ b/tests/auto/quick/qmltests/data/icons/qt32.ico
diff --git a/tests/auto/quick/qmltests2/data/icons/qtmulti.ico b/tests/auto/quick/qmltests/data/icons/qtmulti.ico
index 81e5a22e8..81e5a22e8 100644
--- a/tests/auto/quick/qmltests2/data/icons/qtmulti.ico
+++ b/tests/auto/quick/qmltests/data/icons/qtmulti.ico
diff --git a/tests/auto/quick/qmltests2/data/icons/small-favicon.png b/tests/auto/quick/qmltests/data/icons/small-favicon.png
index 8cf9a50a4..8cf9a50a4 100644
--- a/tests/auto/quick/qmltests2/data/icons/small-favicon.png
+++ b/tests/auto/quick/qmltests/data/icons/small-favicon.png
diff --git a/tests/auto/quick/qmltests2/data/multifileupload.html b/tests/auto/quick/qmltests/data/multifileupload.html
index d41ea15c0..d41ea15c0 100644
--- a/tests/auto/quick/qmltests2/data/multifileupload.html
+++ b/tests/auto/quick/qmltests/data/multifileupload.html
diff --git a/tests/auto/quick/qmltests2/data/prompt.html b/tests/auto/quick/qmltests/data/prompt.html
index 3293c0dcf..3293c0dcf 100644
--- a/tests/auto/quick/qmltests2/data/prompt.html
+++ b/tests/auto/quick/qmltests/data/prompt.html
diff --git a/tests/auto/quick/qmltests2/data/singlefileupload.html b/tests/auto/quick/qmltests/data/singlefileupload.html
index ac91c2c0d..ac91c2c0d 100644
--- a/tests/auto/quick/qmltests2/data/singlefileupload.html
+++ b/tests/auto/quick/qmltests/data/singlefileupload.html
diff --git a/tests/auto/quick/qmltests2/data/titleupdate.js b/tests/auto/quick/qmltests/data/titleupdate.js
index c86139c13..c86139c13 100644
--- a/tests/auto/quick/qmltests2/data/titleupdate.js
+++ b/tests/auto/quick/qmltests/data/titleupdate.js
diff --git a/tests/auto/quick/qmltests_ssl/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml
index 4c252e210..976de88a9 100644
--- a/tests/auto/quick/qmltests_ssl/data/tst_certificateError.qml
+++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml
@@ -83,7 +83,7 @@ TestWebEngineView {
                 if (deferError)
                     error.defer()
                 else if (acceptCertificate)
-                    error.ignoreCertificateError()
+                    error.acceptCertificate()
                 else
                     error.rejectCertificate()
             }
@@ -98,7 +98,7 @@ TestWebEngineView {
 
                 let error = spyError.signalArguments[0][0]
                 if (data.acceptCertificate)
-                    error.ignoreCertificateError()
+                    error.acceptCertificate()
                 else
                     error.rejectCertificate()
             }
diff --git a/tests/auto/quick/qmltests/data/tst_download.qml b/tests/auto/quick/qmltests/data/tst_download.qml
index 1b1750dd8..8607d846d 100644
--- a/tests/auto/quick/qmltests/data/tst_download.qml
+++ b/tests/auto/quick/qmltests/data/tst_download.qml
@@ -155,7 +155,7 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1)
             compare(downloadUrl, webEngineView.url)
             compare(suggestedFileName, "download.zip")
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested)
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested)
             verify(!downloadInterruptReason)
         }
 
@@ -179,11 +179,11 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1)
             compare(downloadUrl, webEngineView.url)
             compare(suggestedFileName, "download.zip")
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested)
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress)
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested)
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress)
             downloadFinishedSpy.wait()
             compare(totalBytes, receivedBytes)
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted)
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted)
             verify(!downloadInterruptReason)
         }
 
@@ -196,8 +196,8 @@ TestWebEngineView {
             compare(downloadUrl, webEngineView.url)
             compare(suggestedFileName, "download.zip")
             compare(downloadFinishedSpy.count, 1)
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadCancelled)
-            tryCompare(webEngineView, "downloadInterruptReason", WebEngineDownloadItem.UserCanceled)
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadCancelled)
+            tryCompare(webEngineView, "downloadInterruptReason", WebEngineDownloadRequest.UserCanceled)
         }
 
         function test_downloadLocation() {
@@ -230,15 +230,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + downloadFileName);
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 1);
             compare(downloadPathChanged, 2);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
         }
 
@@ -253,15 +253,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + "download.zip");
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 0);
             compare(downloadPathChanged, 1);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
 
             // Download the same file to another directory with suggested file name.
@@ -277,15 +277,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + "download.zip");
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 0);
             compare(downloadPathChanged, 1);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
 
             // Download same file to same directory second time -> file name should be unified.
@@ -301,15 +301,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + "download (1).zip");
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 1);
             compare(downloadPathChanged, 1);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
 }
 
@@ -323,15 +323,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadedSetPath);
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 1);
             compare(downloadPathChanged, 2);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
         }
     }
diff --git a/tests/auto/quick/qmltests2/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index 3f522d91a..3f522d91a 100644
--- a/tests/auto/quick/qmltests2/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_faviconDownload.qml b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
index 9aa32279c..9aa32279c 100644
--- a/tests/auto/quick/qmltests2/data/tst_faviconDownload.qml
+++ b/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index ab30d9e82..ab30d9e82 100644
--- a/tests/auto/quick/qmltests2/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_inputMethod.qml b/tests/auto/quick/qmltests/data/tst_inputMethod.qml
index 0bf9f7eb0..0bf9f7eb0 100644
--- a/tests/auto/quick/qmltests2/data/tst_inputMethod.qml
+++ b/tests/auto/quick/qmltests/data/tst_inputMethod.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
index 658071005..658071005 100644
--- a/tests/auto/quick/qmltests2/data/tst_javaScriptDialogs.qml
+++ b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_linkHovered.qml b/tests/auto/quick/qmltests/data/tst_linkHovered.qml
index faf943c55..faf943c55 100644
--- a/tests/auto/quick/qmltests2/data/tst_linkHovered.qml
+++ b/tests/auto/quick/qmltests/data/tst_linkHovered.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml
index db412f252..db412f252 100644
--- a/tests/auto/quick/qmltests2/data/tst_loadFail.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml
diff --git a/tests/auto/quick/qmltests2/data/tst_mouseClick.qml b/tests/auto/quick/qmltests/data/tst_mouseClick.qml
index eaa012f86..eaa012f86 100644
--- a/tests/auto/quick/qmltests2/data/tst_mouseClick.qml
+++ b/tests/auto/quick/qmltests/data/tst_mouseClick.qml
diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index f4fcc30ab..4d0bd28bf 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -31,32 +31,33 @@ import QtTest 1.0
 import QtWebEngine 1.2
 
 Item {
-    WebEngineScript {
-        id: changeDocumentTitleScript
-        sourceUrl: Qt.resolvedUrl("change-document-title.js")
-        injectionPoint: WebEngineScript.DocumentReady
+
+    function changeDocumentTitleScript() {
+        return { name: "changeDocumentTitleScript",
+                  sourceUrl: Qt.resolvedUrl("change-document-title.js"),
+                  injectionPoint: WebEngineScript.DocumentReady }
     }
 
-    WebEngineScript {
-        id: appendDocumentTitleScript
-        sourceUrl: Qt.resolvedUrl("append-document-title.js")
-        injectionPoint: WebEngineScript.DocumentReady
+    function appendDocumentTitleScript() {
+        return { sourceUrl: Qt.resolvedUrl("append-document-title.js"),
+                  injectionPoint: WebEngineScript.DocumentReady }
     }
 
-    WebEngineScript {
-        id: bigUserScript
-        sourceUrl: Qt.resolvedUrl("big-user-script.js")
-        injectionPoint: WebEngineScript.DocumentReady
+    function bigUserScript() {
+        return { sourceUrl: Qt.resolvedUrl("big-user-script.js"),
+                  injectionPoint: WebEngineScript.DocumentReady }
     }
 
-    WebEngineScript {
-        id: scriptWithMetadata
-        sourceUrl: Qt.resolvedUrl("script-with-metadata.js")
+    function scriptWithMetadata() {
+        var script = WebEngine.script()
+        script.sourceUrl = Qt.resolvedUrl("script-with-metadata.js")
+        return script
     }
 
-    WebEngineScript {
-        id: scriptWithBadMatchMetadata
-        sourceUrl: Qt.resolvedUrl("script-with-bad-match-metadata.js")
+    function scriptWithBadMatchMetadata() {
+        var script = WebEngine.script()
+        script.sourceUrl = Qt.resolvedUrl("script-with-bad-match-metadata.js")
+        return script
     }
 
     TestWebEngineView {
@@ -79,21 +80,22 @@ Item {
         onNavigationRequested: {
             var urlString = request.url.toString();
             if (urlString.indexOf("test1.html") !== -1)
-                userScripts = [ changeDocumentTitleScript ];
+                userScripts.collection = [ changeDocumentTitleScript() ];
             else if (urlString.indexOf("test2.html") !== -1)
-                userScripts = [ appendDocumentTitleScript ];
+                userScripts.collection = [ appendDocumentTitleScript() ];
             else
-                userScripts = [];
+                userScripts.collection = [];
         }
     }
 
     TestCase {
         name: "WebEngineViewUserScripts"
 
+
         function init() {
             webEngineView.url = "";
-            webEngineView.userScripts = [];
-            webEngineView.profile.userScripts = [];
+            webEngineView.userScripts.collection = [];
+            webEngineView.profile.userScripts.collection = [];
         }
 
         function test_oneScript() {
@@ -101,7 +103,8 @@ Item {
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "Test page 1");
 
-            webEngineView.userScripts = [ changeDocumentTitleScript ];
+            webEngineView.userScripts.collection = [ changeDocumentTitleScript() ]
+            
             compare(webEngineView.title, "Test page 1");
 
             webEngineView.reload();
@@ -112,7 +115,7 @@ Item {
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "New title");
 
-            webEngineView.userScripts = [];
+            webEngineView.userScripts.collection = [];
             compare(webEngineView.title, "New title");
 
             webEngineView.reload();
@@ -124,23 +127,25 @@ Item {
             webEngineView.url = Qt.resolvedUrl("test1.html");
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "Test page 1");
-
-            webEngineView.userScripts = [ changeDocumentTitleScript, appendDocumentTitleScript ];
+            var script1 = changeDocumentTitleScript();
+            var script2 = appendDocumentTitleScript();
+            script2.injectionPoint = WebEngineScript.Deferred;
+            webEngineView.userScripts.collection = [ script1, script2 ];
 
             // Make sure the scripts are loaded in order.
-            appendDocumentTitleScript.injectionPoint = WebEngineScript.Deferred
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "New title with appendix");
 
-            appendDocumentTitleScript.injectionPoint = WebEngineScript.DocumentReady
-            changeDocumentTitleScript.injectionPoint = WebEngineScript.Deferred
+            script2.injectionPoint = WebEngineScript.DocumentReady
+            script1.injectionPoint = WebEngineScript.Deferred
+            webEngineView.userScripts.collection = [ script1, script2 ];
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "New title");
 
             // Make sure we can remove scripts from the preload list.
-            webEngineView.userScripts = [ appendDocumentTitleScript ];
+            webEngineView.userScripts.collection = [ script2 ];
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "Test page 1 with appendix");
@@ -163,17 +168,18 @@ Item {
         }
 
         function test_bigScript() {
-            webEngineView.userScripts = [ bigUserScript ];
+            webEngineView.userScripts.collection = [ bigUserScript() ];
             webEngineView.url = Qt.resolvedUrl("test1.html");
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView , "title", "Big user script changed title");
         }
 
         function test_parseMetadataHeader() {
-            compare(scriptWithMetadata.name, "Test script");
-            compare(scriptWithMetadata.injectionPoint, WebEngineScript.DocumentReady);
+            var script = scriptWithMetadata()
+            compare(script.name, "Test script");
+            compare(script.injectionPoint, WebEngineScript.DocumentReady);
 
-            webEngineView.userScripts = [ scriptWithMetadata ];
+            webEngineView.userScripts.collection = [ script ];
 
             // @include *data/test*.html
             webEngineView.url = Qt.resolvedUrl("test1.html");
@@ -197,10 +203,11 @@ Item {
         }
 
         function test_dontInjectBadUrlPatternsEverywhere() {
-            compare(scriptWithBadMatchMetadata.name, "Test bad match script");
-            compare(scriptWithBadMatchMetadata.injectionPoint, WebEngineScript.DocumentReady);
+            var script = scriptWithBadMatchMetadata();
+            compare(script.name, "Test bad match script");
+            compare(script.injectionPoint, WebEngineScript.DocumentReady);
 
-            webEngineView.userScripts = [ scriptWithBadMatchMetadata ];
+            webEngineView.userScripts.collection = [ script ];
 
             // @match some:junk
             webEngineView.url = Qt.resolvedUrl("test2.html");
@@ -209,7 +216,7 @@ Item {
         }
 
         function test_profileWideScript() {
-            webEngineView.profile.userScripts = [ changeDocumentTitleScript ];
+            webEngineView.profile.userScripts.collection = [ changeDocumentTitleScript() ];
 
             webEngineView.url = Qt.resolvedUrl("test1.html");
             webEngineView.waitForLoadSucceeded();
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml
index 4ba3be4b9..4ba3be4b9 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml
index 9933fc2f7..9933fc2f7 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml
index 745f533f5..745f533f5 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml
index 36efa7680..36efa7680 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml
index e61f4c230..e61f4c230 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml
index 7c5b16eab..7c5b16eab 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/qmldir b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir
index cf8ac0512..cf8ac0512 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/qmldir
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir
diff --git a/tests/auto/quick/qmltests2/mock-delegates/TestParams/FilePickerParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
index 02b0da1d4..02b0da1d4 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/TestParams/FilePickerParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/TestParams/JSDialogParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml
index 70696803c..70696803c 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/TestParams/JSDialogParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml
diff --git a/tests/auto/quick/qmltests2/mock-delegates/TestParams/qmldir b/tests/auto/quick/qmltests/mock-delegates/TestParams/qmldir
index 5807f1e6e..5807f1e6e 100644
--- a/tests/auto/quick/qmltests2/mock-delegates/TestParams/qmldir
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/qmldir
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index a50bfd7e6..eb53a98bb 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -1,18 +1,109 @@
+include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093
+QT_FOR_CONFIG += webengine-private
+
 include(../tests.pri)
-include(../../shared/http.pri)
 
 QT += qmltest
-
+DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$OUT_PWD$${QMAKE_DIR_SEP}webengine.qmltests)\\\"
 IMPORTPATH += $$PWD/data
 
+QML_TESTS = \
+    $$PWD/data/tst_action.qml \
+    $$PWD/data/tst_activeFocusOnPress.qml \
+    $$PWD/data/tst_audioMuted.qml \
+    $$PWD/data/tst_desktopBehaviorLoadHtml.qml \
+    $$PWD/data/tst_findText.qml \
+    $$PWD/data/tst_focusOnNavigation.qml \
+    $$PWD/data/tst_geopermission.qml \
+    $$PWD/data/tst_getUserMedia.qml \
+    $$PWD/data/tst_keyboardEvents.qml \
+    $$PWD/data/tst_keyboardModifierMapping.qml \
+    $$PWD/data/tst_loadHtml.qml \
+    $$PWD/data/tst_loadProgress.qml \
+    $$PWD/data/tst_loadRecursionCrash.qml \
+    $$PWD/data/tst_loadUrl.qml \
+    $$PWD/data/tst_mouseMove.qml \
+    $$PWD/data/tst_navigationHistory.qml \
+    $$PWD/data/tst_navigationRequested.qml \
+    $$PWD/data/tst_newViewRequest.qml \
+    $$PWD/data/tst_notification.qml \
+    $$PWD/data/tst_profile.qml \
+    $$PWD/data/tst_properties.qml \
+    $$PWD/data/tst_runJavaScript.qml \
+    $$PWD/data/tst_scrollPosition.qml \
+    $$PWD/data/tst_settings.qml \
+    $$PWD/data/tst_titleChanged.qml \
+    $$PWD/data/tst_unhandledKeyEventPropagation.qml \
+    $$PWD/data/tst_userScripts.qml \
+    $$PWD/data/tst_viewSource.qml
+
+qtConfig(webengine-webchannel) {
+    QML_TESTS += $$PWD/data/tst_webchannel.qml
+}
+
+qtConfig(ssl) {
+    include(../../shared/https.pri)
+    QML_TESTS += $$PWD/data/tst_certificateError.qml
+} else {
+    include(../../shared/http.pri)
+}
+
+qtConfig(webengine-testsupport) {
+    QML_TESTS += \
+        $$PWD/data/tst_favicon.qml \
+        $$PWD/data/tst_faviconDownload.qml \
+        $$PWD/data/tst_inputMethod.qml \
+        $$PWD/data/tst_linkHovered.qml \
+        $$PWD/data/tst_loadFail.qml \
+        $$PWD/data/tst_mouseClick.qml
+     qtHaveModule(quickcontrols): QML_TESTS += $$PWD/data/tst_javaScriptDialogs.qml
+} else {
+    PLUGIN_EXTENSION = .so
+    PLUGIN_PREFIX = lib
+    macos: PLUGIN_PREFIX = .dylib
+    win32 {
+        PLUGIN_EXTENSION = .dll
+        PLUGIN_PREFIX =
+    }
+
+    TESTSUPPORT_MODULE = $$shell_path($$[QT_INSTALL_QML]/QtWebEngine/testsupport/$${PLUGIN_PREFIX}qtwebenginetestsupportplugin$${PLUGIN_EXTENSION})
+    BUILD_DIR = $$shell_path($$clean_path($$OUT_PWD/../../../..))
+    SRC_DIR = $$shell_path($$clean_path($$PWD/../../../..))
+
+    warning("QML Test Support API is disabled. This means some QML tests that use Test Support API will fail.")
+    warning("Use the following command to build Test Support module and rebuild WebEngineView API:")
+    warning("cd $$BUILD_DIR && qmake -r $$shell_path($$SRC_DIR/qtwebengine.pro -- --feature-testsupport=yes) && make -C $$shell_path($$BUILD_DIR/src/webengine) clean && make")
+    warning("After performing the command above make sure QML module \"QtWebEngine.testsupport\" is deployed at $$TESTSUPPORT_MODULE")
+}
+
+qtHaveModule(quickcontrols) {
+    QML_TESTS += \
+        $$PWD/data/tst_contextMenu.qml \
+        $$PWD/data/tst_download.qml \
+        $$PWD/data/tst_filePicker.qml
+}
+
 OTHER_FILES += \
     $$PWD/data/TestWebEngineView.qml \
+    $$PWD/data/accepttypes.html \
+    $$PWD/data/alert.html \
+    $$PWD/data/confirm.html \
+    $$PWD/data/confirmclose.html \
     $$PWD/data/append-document-title.js \
     $$PWD/data/big-user-script.js \
     $$PWD/data/change-document-title.js \
     $$PWD/data/download.zip \
     $$PWD/data/directoryupload.html \
     $$PWD/data/favicon.html \
+    $$PWD/data/favicon2.html \
+    $$PWD/data/favicon-candidates-gray.html \
+    $$PWD/data/favicon-misc.html \
+    $$PWD/data/favicon-multi.html \
+    $$PWD/data/favicon-multi-gray.html \
+    $$PWD/data/favicon-single.html \
+    $$PWD/data/favicon-shortcut.html \
+    $$PWD/data/favicon-touch.html \
+    $$PWD/data/favicon-unavailable.html \
     $$PWD/data/forms.html \
     $$PWD/data/geolocation.html \
     $$PWD/data/javascript.html \
@@ -30,40 +121,35 @@ OTHER_FILES += \
     $$PWD/data/keyboardModifierMapping.html \
     $$PWD/data/keyboardEvents.html \
     $$PWD/data/titleupdate.js \
-    $$PWD/data/tst_action.qml \
-    $$PWD/data/tst_activeFocusOnPress.qml \
-    $$PWD/data/tst_audioMuted.qml \
-    $$PWD/data/tst_contextMenu.qml \
-    $$PWD/data/tst_desktopBehaviorLoadHtml.qml \
-    $$PWD/data/tst_download.qml \
-    $$PWD/data/tst_filePicker.qml \
-    $$PWD/data/tst_findText.qml \
-    $$PWD/data/tst_focusOnNavigation.qml \
-    $$PWD/data/tst_geopermission.qml \
-    $$PWD/data/tst_getUserMedia.qml \
-    $$PWD/data/tst_loadHtml.qml \
-    $$PWD/data/tst_loadProgress.qml \
-    $$PWD/data/tst_loadRecursionCrash.qml \
-    $$PWD/data/tst_loadUrl.qml \
-    $$PWD/data/tst_mouseMove.qml \
-    $$PWD/data/tst_navigationHistory.qml \
-    $$PWD/data/tst_navigationRequested.qml \
-    $$PWD/data/tst_newViewRequest.qml \
-    $$PWD/data/tst_notification.qml \
-    $$PWD/data/tst_profile.qml \
-    $$PWD/data/tst_properties.qml \
-    $$PWD/data/tst_runJavaScript.qml \
-    $$PWD/data/tst_scrollPosition.qml \
-    $$PWD/data/tst_titleChanged.qml \
-    $$PWD/data/tst_unhandledKeyEventPropagation.qml \
-    $$PWD/data/tst_userScripts.qml \
-    $$PWD/data/tst_viewSource.qml \
-    $$PWD/data/tst_webchannel.qml \
-    $$PWD/data/tst_settings.qml \
-    $$PWD/data/tst_keyboardModifierMapping.qml \
-    $$PWD/data/tst_keyboardEvents.qml \
-    $$PWD/data/webchannel-test.html \
     $$PWD/data/icons/favicon.png \
+    $$PWD/data/icons/gray128.png \
+    $$PWD/data/icons/gray16.png \
+    $$PWD/data/icons/gray255.png \
+    $$PWD/data/icons/gray32.png \
+    $$PWD/data/icons/gray64.png \
+    $$PWD/data/icons/grayicons.ico \
+    $$PWD/data/icons/qt144.png \
+    $$PWD/data/icons/qt32.ico \
+    $$PWD/data/icons/qtmulti.ico \
+    $$PWD/data/icons/small-favicon.png \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \
+    $$PWD/mock-delegates/TestParams/FilePickerParams.qml \
+    $$PWD/mock-delegates/TestParams/JSDialogParams.qml \
+    $$PWD/mock-delegates/TestParams/qmldir
+
+OTHER_FILES += $$QML_TESTS
+
+!build_pass:!isEmpty(QML_TESTS) {
+    for (file, QML_TESTS): QML_TESTS_CONTENT += "$${file}"
+    TEST_FILE = $$OUT_PWD/webengine.qmltests
+    write_file($$TEST_FILE, QML_TESTS_CONTENT)
+}
 
 load(qt_build_paths)
-DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
+
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 5677f9047..8423df1bd 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -28,6 +28,10 @@
 
 #include <httpserver.h>
 
+#if QT_CONFIG(ssl)
+#include <httpsserver.h>
+#endif
+
 #include <QtCore/QScopedPointer>
 #include <QTemporaryDir>
 #include <QtQuickTest/quicktest.h>
@@ -130,7 +134,7 @@ int main(int argc, char **argv)
     QLocale::setDefault(QLocale("en"));
 
     static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
-    QVector<const char *> w_argv(argc); \
+    QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
         w_argv[i] = argv[i]; \
     for (int i = 0; i < params.size(); ++i) \
@@ -151,6 +155,12 @@ int main(int argc, char **argv)
         return server;
     });
 
+#if QT_CONFIG(ssl)
+    qmlRegisterSingletonType<HttpsServer>(
+            "Test.Shared", 1, 0, "HttpsServer",
+            [&](QQmlEngine *, QJSEngine *) { return new HttpsServer; });
+#endif
+
     int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR);
     return i;
 }
diff --git a/tests/auto/quick/qmltests2/data/favicon.html b/tests/auto/quick/qmltests2/data/favicon.html
deleted file mode 100644
index e1b84a9cc..000000000
--- a/tests/auto/quick/qmltests2/data/favicon.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<link type="image/png" href="icons/favicon.png" sizes="48x48" rel="icon" />
-</head>
-<body>
-<p>It's expected that you see a favicon displayed for this page when you open it as a local file.</p>
-<p>The favicon looks like this:</p>
-<img id='image' src="icons/favicon.png"/>
-</body>
-</html>
diff --git a/tests/auto/quick/qmltests2/data/icons/favicon.png b/tests/auto/quick/qmltests2/data/icons/favicon.png
deleted file mode 100644
index 35717cca5..000000000
--- a/tests/auto/quick/qmltests2/data/icons/favicon.png
+++ /dev/null
diff --git a/tests/auto/quick/qmltests2/data/test1.html b/tests/auto/quick/qmltests2/data/test1.html
deleted file mode 100644
index 5c09f06ed..000000000
--- a/tests/auto/quick/qmltests2/data/test1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head><title>Test page 1</title></head>
-<body>
-Hello.
-</body>
-</html>
diff --git a/tests/auto/quick/qmltests2/data/test2.html b/tests/auto/quick/qmltests2/data/test2.html
deleted file mode 100644
index 629c2a063..000000000
--- a/tests/auto/quick/qmltests2/data/test2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head><title>Test page with huge link area</title></head>
-<body>
-<a title="A title" href="test1.html"><img width=200 height=200></a>
-</body>
-</html>
diff --git a/tests/auto/quick/qmltests2/qmltests2.pro b/tests/auto/quick/qmltests2/qmltests2.pro
deleted file mode 100644
index 4c7a8dc72..000000000
--- a/tests/auto/quick/qmltests2/qmltests2.pro
+++ /dev/null
@@ -1,78 +0,0 @@
-include(../tests.pri)
-
-QT += qmltest
-
-IMPORTPATH += $$PWD/data
-
-OTHER_FILES += \
-    $$PWD/data/accepttypes.html \
-    $$PWD/data/alert.html \
-    $$PWD/data/confirm.html \
-    $$PWD/data/confirmclose.html \
-    $$PWD/data/directoryupload.html \
-    $$PWD/data/favicon.html \
-    $$PWD/data/favicon2.html \
-    $$PWD/data/favicon-candidates-gray.html \
-    $$PWD/data/favicon-misc.html \
-    $$PWD/data/favicon-multi.html \
-    $$PWD/data/favicon-multi-gray.html \
-    $$PWD/data/favicon-single.html \
-    $$PWD/data/favicon-shortcut.html \
-    $$PWD/data/favicon-touch.html \
-    $$PWD/data/favicon-unavailable.html \
-    $$PWD/data/multifileupload.html \
-    $$PWD/data/prompt.html \
-    $$PWD/data/singlefileupload.html \
-    $$PWD/data/test1.html \
-    $$PWD/data/test2.html \
-    $$PWD/data/titleupdate.js \
-    $$PWD/data/tst_favicon.qml \
-    $$PWD/data/tst_faviconDownload.qml \
-    $$PWD/data/tst_inputMethod.qml \
-    $$PWD/data/tst_javaScriptDialogs.qml \
-    $$PWD/data/tst_linkHovered.qml \
-    $$PWD/data/tst_loadFail.qml \
-    $$PWD/data/tst_mouseClick.qml \
-    $$PWD/data/icons/favicon.png \
-    $$PWD/data/icons/gray128.png \
-    $$PWD/data/icons/gray16.png \
-    $$PWD/data/icons/gray255.png \
-    $$PWD/data/icons/gray32.png \
-    $$PWD/data/icons/gray64.png \
-    $$PWD/data/icons/grayicons.ico \
-    $$PWD/data/icons/qt144.png \
-    $$PWD/data/icons/qt32.ico \
-    $$PWD/data/icons/qtmulti.ico \
-    $$PWD/data/icons/small-favicon.png \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \
-    $$PWD/mock-delegates/TestParams/FilePickerParams.qml \
-    $$PWD/mock-delegates/TestParams/JSDialogParams.qml \
-    $$PWD/mock-delegates/TestParams/qmldir \
-
-load(qt_build_paths)
-DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
-
-!qtConfig(webengine-testsupport) {
-    PLUGIN_EXTENSION = .so
-    PLUGIN_PREFIX = lib
-    osx: PLUGIN_PREFIX = .dylib
-    win32 {
-        PLUGIN_EXTENSION = .dll
-        PLUGIN_PREFIX =
-    }
-
-    TESTSUPPORT_MODULE = $$shell_path($$[QT_INSTALL_QML]/QtWebEngine/testsupport/$${PLUGIN_PREFIX}qtwebenginetestsupportplugin$${PLUGIN_EXTENSION})
-    BUILD_DIR = $$shell_path($$clean_path($$OUT_PWD/../../../..))
-    SRC_DIR = $$shell_path($$clean_path($$PWD/../../../..))
-
-    warning("QML Test Support API is disabled. This means some QML tests that use Test Support API will fail.")
-    warning("Use the following command to build Test Support module and rebuild WebEngineView API:")
-    warning("cd $$BUILD_DIR && qmake -r $$shell_path($$SRC_DIR/qtwebengine.pro -- --feature-testsupport=yes) && make -C $$shell_path($$BUILD_DIR/src/webengine) clean && make")
-    warning("After performing the command above make sure QML module \"QtWebEngine.testsupport\" is deployed at $$TESTSUPPORT_MODULE")
-}
diff --git a/tests/auto/quick/qmltests2/tst_qmltests2.cpp b/tests/auto/quick/qmltests2/tst_qmltests2.cpp
deleted file mode 100644
index 8c81ed7f5..000000000
--- a/tests/auto/quick/qmltests2/tst_qmltests2.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QScopedPointer>
-#include <QtQuickTest/quicktest.h>
-#include <QtWebEngine/QQuickWebEngineProfile>
-#include "qt_webengine_quicktest.h"
-
-#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#endif
-
-#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
-static bool debuggerPresent()
-{
-    int fd = open("/proc/self/status", O_RDONLY);
-    if (fd == -1)
-      return false;
-    char buffer[2048];
-    ssize_t size = read(fd, buffer, sizeof(buffer) - 1);
-    if (size == -1) {
-      close(fd);
-      return false;
-    }
-    buffer[size] = 0;
-    const char tracerPidToken[] = "\nTracerPid:";
-    char *tracerPid = strstr(buffer, tracerPidToken);
-    if (!tracerPid) {
-      close(fd);
-      return false;
-    }
-    tracerPid += sizeof(tracerPidToken);
-    long int pid = strtol(tracerPid, &tracerPid, 10);
-    close(fd);
-    return pid != 0;
-}
-
-static void stackTrace()
-{
-    bool ok = false;
-    const int disableStackDump = qEnvironmentVariableIntValue("QTEST_DISABLE_STACK_DUMP", &ok);
-    if (ok && disableStackDump == 1)
-        return;
-
-    if (debuggerPresent())
-        return;
-
-    fprintf(stderr, "\n========= Received signal, dumping stack ==============\n");
-    char cmd[512];
-    qsnprintf(cmd, 512, "gdb --pid %d 2>/dev/null <<EOF\n"
-                        "set prompt\n"
-                        "set height 0\n"
-                        "thread apply all where full\n"
-                        "detach\n"
-                        "quit\n"
-                        "EOF\n",
-                        (int)getpid());
-
-    if (system(cmd) == -1)
-        fprintf(stderr, "calling gdb failed\n");
-    fprintf(stderr, "========= End of stack trace ==============\n");
-}
-
-static void sigSegvHandler(int signum)
-{
-    stackTrace();
-    qFatal("Received signal %d", signum);
-}
-#endif
-
-int main(int argc, char **argv)
-{
-#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
-    struct sigaction sigAction;
-
-    sigemptyset(&sigAction.sa_mask);
-    sigAction.sa_handler = &sigSegvHandler;
-    sigAction.sa_flags = 0;
-
-    sigaction(SIGSEGV, &sigAction, 0);
-#endif
-
-    // Inject the mock ui delegates module
-    qputenv("QML2_IMPORT_PATH", QByteArray(TESTS_SOURCE_DIR "qmltests2/mock-delegates"));
-    QScopedPointer<Application> app;
-
-    // Force to use English language for testing due to error message checks
-    QLocale::setDefault(QLocale("en"));
-
-    if (!QCoreApplication::instance()) {
-        app.reset(new Application(argc, argv));
-    }
-    QtWebEngine::initialize();
-    QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
-
-    QTEST_SET_MAIN_SOURCE_PATH
-
-    int i = quick_test_main(argc, argv, "qmltests2", QUICK_TEST_SOURCE_DIR);
-    return i;
-}
diff --git a/tests/auto/quick/qmltests_ssl/data/TestWebEngineView.qml b/tests/auto/quick/qmltests_ssl/data/TestWebEngineView.qml
deleted file mode 100644
index 6db076ae8..000000000
--- a/tests/auto/quick/qmltests_ssl/data/TestWebEngineView.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtTest 1.1
-import QtWebEngine 1.7
-
-WebEngineView {
-    property var loadStatus: null
-    property bool windowCloseRequestedSignalEmitted: false
-    settings.focusOnNavigationEnabled: true
-
-    function waitForLoadSucceeded(timeout) {
-        var success = _waitFor(function() { return loadStatus == WebEngineView.LoadSucceededStatus }, timeout)
-        loadStatus = null
-        return success
-    }
-    function waitForLoadFailed(timeout) {
-        var failure = _waitFor(function() { return loadStatus == WebEngineView.LoadFailedStatus }, timeout)
-        loadStatus = null
-        return failure
-    }
-    function waitForLoadStopped(timeout) {
-        var stop = _waitFor(function() { return loadStatus == WebEngineView.LoadStoppedStatus }, timeout)
-        loadStatus = null
-        return stop
-    }
-    function waitForWindowCloseRequested() {
-        return _waitFor(function() { return windowCloseRequestedSignalEmitted; });
-    }
-    function _waitFor(predicate, timeout) {
-        if (timeout === undefined)
-            timeout = 12000;
-        var i = 0
-        while (i < timeout && !predicate()) {
-            testResult.wait(50)
-            i += 50
-        }
-        return predicate()
-    }
-
-    function getActiveElementId() {
-        var activeElementId;
-        runJavaScript("document.activeElement.id", function(result) {
-            activeElementId = result;
-        });
-        testCase.tryVerify(function() { return activeElementId != undefined });
-        return activeElementId;
-    }
-
-    function verifyElementHasFocus(element) {
-        testCase.tryVerify(function() { return getActiveElementId() == element; }, 5000,
-            "Element \"" + element + "\" has focus");
-    }
-
-    function setFocusToElement(element) {
-        runJavaScript("document.getElementById('" + element + "').focus()");
-        verifyElementHasFocus(element);
-    }
-
-    function getElementCenter(element) {
-            var center;
-            runJavaScript("(function() {" +
-                          "   var elem = document.getElementById('" + element + "');" +
-                          "   var rect = elem.getBoundingClientRect();" +
-                          "   return { 'x': (rect.left + rect.right) / 2, 'y': (rect.top + rect.bottom) / 2 };" +
-                          "})();", function(result) { center = result } );
-            testCase.tryVerify(function() { return center !== undefined; });
-            return center;
-    }
-
-    function getTextSelection() {
-        var textSelection;
-        runJavaScript("window.getSelection().toString()", function(result) { textSelection = result });
-        testCase.tryVerify(function() { return textSelection !== undefined; });
-        return textSelection;
-    }
-
-    TestResult { id: testResult }
-    TestCase { id: testCase }
-
-    onLoadingChanged: {
-        loadStatus = loadRequest.status
-    }
-
-    onWindowCloseRequested: {
-        windowCloseRequestedSignalEmitted = true;
-    }
-
-    function getBodyText() {
-        let text
-        runJavaScript('document.body.innerText', function(t) { text = t })
-        testCase.tryVerify(function() { return text !== undefined })
-        return text
-    }
-}
-
diff --git a/tests/auto/quick/qmltests_ssl/qmltests_ssl.pro b/tests/auto/quick/qmltests_ssl/qmltests_ssl.pro
deleted file mode 100644
index a8325e497..000000000
--- a/tests/auto/quick/qmltests_ssl/qmltests_ssl.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-include(../tests.pri)
-include(../../shared/https.pri)
-QT += qmltest
-
-IMPORTPATH += $$PWD/data
-
-OTHER_FILES += $$PWD/data/tst_certificateError.qml
-
-load(qt_build_paths)
-DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
diff --git a/tests/auto/quick/qmltests_ssl/tst_qmltests_ssl.cpp b/tests/auto/quick/qmltests_ssl/tst_qmltests_ssl.cpp
deleted file mode 100644
index 1f54ffd8e..000000000
--- a/tests/auto/quick/qmltests_ssl/tst_qmltests_ssl.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtNetwork/qtnetwork-config.h>
-
-#if QT_CONFIG(ssl)
-#include <httpsserver.h>
-#endif
-
-#include <QtCore/QScopedPointer>
-#include <QTemporaryDir>
-#include <QtQuickTest/quicktest.h>
-#include <QtWebEngine/QQuickWebEngineProfile>
-#include <QQmlEngine>
-#include "qt_webengine_quicktest.h"
-
-#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#endif
-
-#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
-static bool debuggerPresent()
-{
-    int fd = open("/proc/self/status", O_RDONLY);
-    if (fd == -1)
-      return false;
-    char buffer[2048];
-    ssize_t size = read(fd, buffer, sizeof(buffer) - 1);
-    if (size == -1) {
-      close(fd);
-      return false;
-    }
-    buffer[size] = 0;
-    const char tracerPidToken[] = "\nTracerPid:";
-    char *tracerPid = strstr(buffer, tracerPidToken);
-    if (!tracerPid) {
-      close(fd);
-      return false;
-    }
-    tracerPid += sizeof(tracerPidToken);
-    long int pid = strtol(tracerPid, &tracerPid, 10);
-    close(fd);
-    return pid != 0;
-}
-
-static void stackTrace()
-{
-    bool ok = false;
-    const int disableStackDump = qEnvironmentVariableIntValue("QTEST_DISABLE_STACK_DUMP", &ok);
-    if (ok && disableStackDump == 1)
-        return;
-
-    if (debuggerPresent())
-        return;
-
-    fprintf(stderr, "\n========= Received signal, dumping stack ==============\n");
-    char cmd[512];
-    qsnprintf(cmd, 512, "gdb --pid %d 2>/dev/null <<EOF\n"
-                        "set prompt\n"
-                        "set height 0\n"
-                        "thread apply all where full\n"
-                        "detach\n"
-                        "quit\n"
-                        "EOF\n",
-                        (int)getpid());
-
-    if (system(cmd) == -1)
-        fprintf(stderr, "calling gdb failed\n");
-    fprintf(stderr, "========= End of stack trace ==============\n");
-}
-
-static void sigSegvHandler(int signum)
-{
-    stackTrace();
-    qFatal("Received signal %d", signum);
-}
-#endif
-
-class TempDir : public QObject {
-    Q_OBJECT
-
-public:
-    Q_INVOKABLE QString path() {
-        Q_ASSERT(tempDir.isValid());
-        return tempDir.isValid() ? tempDir.path() : QString();
-    }
-
-private:
-    QTemporaryDir tempDir;
-};
-
-int main(int argc, char **argv)
-{
-#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
-    struct sigaction sigAction;
-
-    sigemptyset(&sigAction.sa_mask);
-    sigAction.sa_handler = &sigSegvHandler;
-    sigAction.sa_flags = 0;
-
-    sigaction(SIGSEGV, &sigAction, 0);
-#endif
-
-    QScopedPointer<Application> app;
-
-    // Force to use English language for testing due to error message checks
-    QLocale::setDefault(QLocale("en"));
-
-    static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
-    QVector<const char *> w_argv(argc); \
-    for (int i = 0; i < argc; ++i) \
-        w_argv[i] = argv[i]; \
-    for (int i = 0; i < params.size(); ++i) \
-        w_argv.append(params[i].data()); \
-    int w_argc = w_argv.size(); \
-
-    if (!QCoreApplication::instance()) {
-        app.reset(new Application(w_argc, const_cast<char **>(w_argv.data())));
-    }
-    QtWebEngine::initialize();
-    QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
-    qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir");
-
-    QTEST_SET_MAIN_SOURCE_PATH
-#if QT_CONFIG(ssl)
-    qmlRegisterSingletonType<HttpsServer>("Test.Shared", 1, 0, "HttpsServer", [&] (QQmlEngine *, QJSEngine *) { return new HttpsServer; });
-#endif
-    int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR);
-    return i;
-}
-
-#include "tst_qmltests_ssl.moc"
diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST
new file mode 100644
index 000000000..d4a35a76a
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineview/BLACKLIST
@@ -0,0 +1,2 @@
+[javascriptClipboard]
+ubuntu-20.04
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 5ee30f165..189eead04 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -38,6 +38,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtTest/QtTest>
 #include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngine/QQuickWebEngineScriptCollection>
 #include <QtGui/private/qinputmethod_p.h>
 #include <QtWebEngine/private/qquickwebengineview_p.h>
 #include <QtWebEngine/private/qquickwebenginesettings_p.h>
@@ -584,7 +585,7 @@ void tst_QQuickWebEngineView::interruptImeTextComposition()
         QTest::mouseClick(view->window(), Qt::LeftButton, {}, textInputCenter);
     } else if (eventType == "Touch") {
         QPoint textInputCenter = elementCenter(view, QStringLiteral("input2"));
-        QTouchDevice *touchDevice = QTest::createTouchDevice();
+        QPointingDevice *touchDevice = QTest::createTouchDevice();
         QTest::touchEvent(view->window(), touchDevice).press(0, textInputCenter, view->window());
         QTest::touchEvent(view->window(), touchDevice).release(0, textInputCenter, view->window());
     }
@@ -975,9 +976,7 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress
     QTest::mousePress(view->window(), Qt::LeftButton);
     QTest::mouseRelease(view->window(), Qt::LeftButton);
 
-    QTouchDevice *device = new QTouchDevice;
-    device->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(device);
+    QPointingDevice *device = QTest::createTouchDevice();
 
     QTest::touchEvent(view->window(), device).press(0, QPoint(0,0), view->window());
     QTest::touchEvent(view->window(), device).move(0, QPoint(1, 1), view->window());
@@ -1037,10 +1036,10 @@ void tst_QQuickWebEngineView::userScripts()
     QScopedPointer<QQuickWebEngineView> webEngineView2(newWebEngineView());
     webEngineView2->setParentItem(m_window->contentItem());
 
-    QQmlListReference list(webEngineView1->profile(), "userScripts");
-    QQuickWebEngineScript script;
+    QQuickWebEngineScriptCollection *collection = webEngineView1->profile()->userScripts();
+    QWebEngineScript script;
     script.setSourceCode("document.title = 'New title';");
-    list.append(&script);
+    collection->insert(script);
 
     webEngineView1->setUrl(urlFromTestPath("html/basic_page.html"));
     QVERIFY(waitForLoadSucceeded(webEngineView1.data()));
@@ -1050,7 +1049,7 @@ void tst_QQuickWebEngineView::userScripts()
     QVERIFY(waitForLoadSucceeded(webEngineView2.data()));
     QTRY_COMPARE(webEngineView2->title(), QStringLiteral("New title"));
 
-    list.clear();
+    collection->clear();
 }
 
 void tst_QQuickWebEngineView::javascriptClipboard_data()
@@ -1164,17 +1163,17 @@ void tst_QQuickWebEngineView::setProfile() {
 void tst_QQuickWebEngineView::focusChild_data()
 {
     QTest::addColumn<QString>("interfaceName");
-    QTest::addColumn<QVector<QAccessible::Role>>("ancestorRoles");
+    QTest::addColumn<QList<QAccessible::Role>>("ancestorRoles");
 
-    QTest::newRow("QQuickWebEngineView") << QString("QQuickWebEngineView") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("QQuickView") << QString("QQuickView") << QVector<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* view */});
+    QTest::newRow("QQuickWebEngineView") << QString("QQuickWebEngineView") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("QQuickView") << QString("QQuickView") << QList<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* view */});
 }
 
 void tst_QQuickWebEngineView::focusChild()
 {
     auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * {
-        QFETCH(QVector<QAccessible::Role>, ancestorRoles);
+        QFETCH(QList<QAccessible::Role>, ancestorRoles);
         for (int i = 0; i < ancestorRoles.size(); ++i) {
             if (iface->childCount() == 0 || iface->role() != ancestorRoles[i])
                 return nullptr;
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 41ea5c4c1..4648b2f64 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -10,15 +10,11 @@ SUBDIRS += \
     publicapi \
     qquickwebenginedefaultsurfaceformat \
     qquickwebengineview \
-    qtbug-70248
+    qtbug-70248 \
+    certificateerror
 
 qtConfig(webengine-testsupport) {
-    SUBDIRS += \
-        qmltests2 \
-        qquickwebengineviewgraphics
+    SUBDIRS += qquickwebengineviewgraphics
 }
 
-qtConfig(ssl): SUBDIRS += qmltests_ssl
-
-# QTBUG-66055
-boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests qmltests2
+boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h
index b7b7b1564..132c353ca 100644
--- a/tests/auto/quick/shared/util.h
+++ b/tests/auto/quick/shared/util.h
@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) \
 { \
     QtWebEngine::initialize(); \
     \
-    QVector<const char *> w_argv(argc); \
+    QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
         w_argv[i] = argv[i]; \
     for (int i = 0; i < params.size(); ++i) \
diff --git a/tests/auto/shared/httpsserver.h b/tests/auto/shared/httpsserver.h
index 32c8e8345..219d5f7a1 100644
--- a/tests/auto/shared/httpsserver.h
+++ b/tests/auto/shared/httpsserver.h
@@ -55,7 +55,7 @@ struct SslTcpServer : QTcpServer
             return;
         }
 
-        connect(socket, QOverload<QSslSocket::SocketError>::of(&QSslSocket::error),
+        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; });
diff --git a/tests/auto/widgets/accessibility/BLACKLIST b/tests/auto/widgets/accessibility/BLACKLIST
new file mode 100644
index 000000000..41d3635d2
--- /dev/null
+++ b/tests/auto/widgets/accessibility/BLACKLIST
@@ -0,0 +1,2 @@
+[focusChild]
+*
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 84382d6f1..e73f7d89b 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -151,17 +151,17 @@ void tst_Accessibility::hierarchy()
 void tst_Accessibility::focusChild_data()
 {
     QTest::addColumn<QString>("interfaceName");
-    QTest::addColumn<QVector<QAccessible::Role>>("ancestorRoles");
+    QTest::addColumn<QList<QAccessible::Role>>("ancestorRoles");
 
-    QTest::newRow("QWebEngineView") << QString("QWebEngineView") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("QMainWindow") << QString("QMainWindow") << QVector<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* central widget */, QAccessible::Client /* view */});
+    QTest::newRow("QWebEngineView") << QString("QWebEngineView") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("QMainWindow") << QString("QMainWindow") << QList<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* central widget */, QAccessible::Client /* view */});
 }
 
 void tst_Accessibility::focusChild()
 {
     auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * {
-        QFETCH(QVector<QAccessible::Role>, ancestorRoles);
+        QFETCH(QList<QAccessible::Role>, ancestorRoles);
         for (int i = 0; i < ancestorRoles.size(); ++i) {
             if (iface->childCount() == 0 || iface->role() != ancestorRoles[i])
                 return nullptr;
diff --git a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
index c5b761818..063a53ae2 100644
--- a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
@@ -58,11 +58,18 @@ struct PageWithCertificateErrorHandler : QWebEnginePage
     QSignalSpy loadSpy;
     QScopedPointer<QWebEngineCertificateError> error;
 
-    bool certificateError(const QWebEngineCertificateError &e) override {
+    void certificateError(QWebEngineCertificateError e) override
+    {
         error.reset(new QWebEngineCertificateError(e));
-        if (deferError)
+        if (deferError) {
             error->defer();
-        return acceptCertificate;
+            return;
+        }
+
+        if (acceptCertificate)
+            error->acceptCertificate();
+        else
+            error->rejectCertificate();
     }
 };
 
@@ -103,17 +110,14 @@ void tst_CertificateError::handleError()
     QCOMPARE(chain[1].serialNumber(), "6d:52:fb:b4:57:3b:b2:03:c8:62:7b:7e:44:45:5c:d3:08:87:74:17");
 
     if (deferError) {
-        QVERIFY(page.error->deferred());
-        QVERIFY(!page.error->answered());
         QCOMPARE(page.loadSpy.count(), 0);
         QCOMPARE(toPlainTextSync(&page), QString());
 
         if (acceptCertificate)
-            page.error->ignoreCertificateError();
+            page.error->acceptCertificate();
         else
             page.error->rejectCertificate();
 
-        QVERIFY(page.error->answered());
         page.error.reset();
     }
     QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.count(), 1, 30000);
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 32bf53931..143a4a4e5 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -214,12 +214,12 @@ void tst_LoadSignals::fileDownloadDoesNotTriggerLoadSignals_qtbug66661()
     // allow the download
     QTemporaryDir tempDir;
     QVERIFY(tempDir.isValid());
-    QWebEngineDownloadItem::DownloadState downloadState = QWebEngineDownloadItem::DownloadRequested;
+    QWebEngineDownloadRequest::DownloadState downloadState = QWebEngineDownloadRequest::DownloadRequested;
     ScopedConnection sc1 =
             connect(&profile, &QWebEngineProfile::downloadRequested,
-                    [&downloadState, &tempDir](QWebEngineDownloadItem *item) {
-                        connect(item, &QWebEngineDownloadItem::stateChanged,
-                                [&downloadState](QWebEngineDownloadItem::DownloadState newState) {
+                    [&downloadState, &tempDir](QWebEngineDownloadRequest *item) {
+                        connect(item, &QWebEngineDownloadRequest::stateChanged,
+                                [&downloadState](QWebEngineDownloadRequest::DownloadState newState) {
                                     downloadState = newState;
                                 });
                         item->setDownloadDirectory(tempDir.path());
@@ -236,7 +236,7 @@ void tst_LoadSignals::fileDownloadDoesNotTriggerLoadSignals_qtbug66661()
                 || (loadFinishedSpy.size() != 1), 10000, 100);
 
     // Download must have occurred
-    QTRY_COMPARE(downloadState, QWebEngineDownloadItem::DownloadCompleted);
+    QTRY_COMPARE(downloadState, QWebEngineDownloadRequest::DownloadCompleted);
 
     // No further loadStarted should have occurred within this time
     QCOMPARE(loadStartedSpy.size(), 1);
diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp
index c24fbede4..92f94ef5d 100644
--- a/tests/auto/widgets/origins/tst_origins.cpp
+++ b/tests/auto/widgets/origins/tst_origins.cpp
@@ -33,15 +33,16 @@
 #include <QtWebEngineCore/qwebengineurlrequestjob.h>
 #include <QtWebEngineCore/qwebengineurlscheme.h>
 #include <QtWebEngineCore/qwebengineurlschemehandler.h>
+#include <QtWebEngineCore/qwebenginesettings.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
 #include <QtWebEngineWidgets/qwebengineprofile.h>
-#include <QtWebEngineWidgets/qwebenginesettings.h>
+
 #if defined(WEBSOCKETS)
 #include <QtWebSockets/qwebsocket.h>
 #include <QtWebSockets/qwebsocketserver.h>
 #include <QtWebChannel/qwebchannel.h>
 #endif
-#include <QtWidgets/qaction.h>
+#include <qaction.h>
 
 #define QSL QStringLiteral
 #define QBAL QByteArrayLiteral
@@ -169,7 +170,7 @@ public:
         profile->installUrlSchemeHandler(QBAL("cors"), this);
     }
 
-    QVector<QUrl> &requests() { return m_requests; }
+    QList<QUrl> &requests() { return m_requests; }
 
 private:
     void requestStarted(QWebEngineUrlRequestJob *job) override
@@ -198,7 +199,7 @@ private:
         job->reply(mimeType, file);
     }
 
-    QVector<QUrl> m_requests;
+    QList<QUrl> m_requests;
 };
 
 class tst_Origins final : public QObject {
diff --git a/tests/auto/widgets/proxy/proxy_server.cpp b/tests/auto/widgets/proxy/proxy_server.cpp
index 3bf915609..3e52de4f2 100644
--- a/tests/auto/widgets/proxy/proxy_server.cpp
+++ b/tests/auto/widgets/proxy/proxy_server.cpp
@@ -39,7 +39,7 @@ ProxyServer::ProxyServer(QObject *parent) : QObject(parent)
 void ProxyServer::setCredentials(const QByteArray &user, const QByteArray password)
 {
     m_auth.append(user);
-    m_auth.append(QChar(':'));
+    m_auth.append(':');
     m_auth.append(password);
     m_auth = m_auth.toBase64();
     m_authenticate = true;
diff --git a/tests/auto/widgets/qwebenginedownloaditem/qwebenginedownloaditem.pro b/tests/auto/widgets/qwebenginedownloadrequest/qwebenginedownloadrequest.pro
index 18a66c466..18a66c466 100644
--- a/tests/auto/widgets/qwebenginedownloaditem/qwebenginedownloaditem.pro
+++ b/tests/auto/widgets/qwebenginedownloadrequest/qwebenginedownloadrequest.pro
diff --git a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
index ac38e2ed2..483eb08c3 100644
--- a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
+++ b/tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
@@ -34,14 +34,14 @@
 #include <QTemporaryDir>
 #include <QTest>
 #include <QRegularExpression>
-#include <QWebEngineDownloadItem>
+#include <QWebEngineDownloadRequest>
 #include <QWebEnginePage>
 #include <QWebEngineProfile>
 #include <QWebEngineSettings>
 #include <QWebEngineView>
 #include <httpserver.h>
 
-class tst_QWebEngineDownloadItem : public QObject
+class tst_QWebEngineDownloadRequest : public QObject
 {
     Q_OBJECT
 
@@ -79,9 +79,6 @@ private Q_SLOTS:
     void downloadToDefaultLocation();
     void downloadToNonExistentDir();
     void downloadToReadOnlyDir();
-#if QT_DEPRECATED_SINCE(5, 14)
-    void downloadPathValidation();
-#endif
     void downloadToDirectoryWithFileName_data();
     void downloadToDirectoryWithFileName();
 
@@ -90,34 +87,30 @@ private:
     void clickLink(QPoint linkPos);
     void simulateUserAction(QPoint linkPos, UserAction action);
 
-    QWebEngineDownloadItem::DownloadType expectedDownloadType(
-        UserAction userAction,
-        const QByteArray &contentDisposition = QByteArray());
-
     HttpServer *m_server;
     QWebEngineProfile *m_profile;
     QWebEnginePage *m_page;
     QWebEngineView *m_view;
-    QSet<QWebEngineDownloadItem *> m_requestedDownloads;
-    QSet<QWebEngineDownloadItem *> m_finishedDownloads;
+    QSet<QWebEngineDownloadRequest *> m_requestedDownloads;
+    QSet<QWebEngineDownloadRequest *> m_finishedDownloads;
 };
 
-Q_DECLARE_METATYPE(tst_QWebEngineDownloadItem::UserAction)
-Q_DECLARE_METATYPE(tst_QWebEngineDownloadItem::FileAction)
+Q_DECLARE_METATYPE(tst_QWebEngineDownloadRequest::UserAction)
+Q_DECLARE_METATYPE(tst_QWebEngineDownloadRequest::FileAction)
 
-void tst_QWebEngineDownloadItem::initTestCase()
+void tst_QWebEngineDownloadRequest::initTestCase()
 {
     m_server = new HttpServer();
     m_profile = new QWebEngineProfile;
     m_profile->setHttpCacheType(QWebEngineProfile::NoCache);
     m_profile->settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
-    connect(m_profile, &QWebEngineProfile::downloadRequested, [this](QWebEngineDownloadItem *item) {
+    connect(m_profile, &QWebEngineProfile::downloadRequested, [this](QWebEngineDownloadRequest *item) {
         m_requestedDownloads.insert(item);
-        connect(item, &QWebEngineDownloadItem::destroyed, [this, item](){
+        connect(item, &QWebEngineDownloadRequest::destroyed, [this, item](){
             m_requestedDownloads.remove(item);
             m_finishedDownloads.remove(item);
         });
-        connect(item, &QWebEngineDownloadItem::finished, [this, item](){
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [this, item](){
             m_finishedDownloads.insert(item);
         });
     });
@@ -128,14 +121,14 @@ void tst_QWebEngineDownloadItem::initTestCase()
     m_view->show();
 }
 
-void tst_QWebEngineDownloadItem::init()
+void tst_QWebEngineDownloadRequest::init()
 {
     QVERIFY(m_server->start());
 }
 
-void tst_QWebEngineDownloadItem::cleanup()
+void tst_QWebEngineDownloadRequest::cleanup()
 {
-    for (QWebEngineDownloadItem *item : m_finishedDownloads) {
+    for (QWebEngineDownloadRequest *item : m_finishedDownloads) {
         item->deleteLater();
     }
     QTRY_COMPARE(m_requestedDownloads.count(), 0);
@@ -145,7 +138,7 @@ void tst_QWebEngineDownloadItem::cleanup()
     m_profile->setDownloadPath("");
 }
 
-void tst_QWebEngineDownloadItem::cleanupTestCase()
+void tst_QWebEngineDownloadRequest::cleanupTestCase()
 {
     delete m_view;
     delete m_page;
@@ -153,7 +146,7 @@ void tst_QWebEngineDownloadItem::cleanupTestCase()
     delete m_server;
 }
 
-void tst_QWebEngineDownloadItem::saveLink(QPoint linkPos)
+void tst_QWebEngineDownloadRequest::saveLink(QPoint linkPos)
 {
     // Simulate right-clicking on link and choosing "save link as" from menu.
     QSignalSpy menuSpy(m_view, &QWebEngineView::customContextMenuRequested);
@@ -170,7 +163,7 @@ void tst_QWebEngineDownloadItem::saveLink(QPoint linkPos)
     m_page->triggerAction(QWebEnginePage::DownloadLinkToDisk);
 }
 
-void tst_QWebEngineDownloadItem::clickLink(QPoint linkPos)
+void tst_QWebEngineDownloadRequest::clickLink(QPoint linkPos)
 {
     // Simulate left-clicking on link.
     QTRY_VERIFY(m_view->focusWidget());
@@ -178,7 +171,7 @@ void tst_QWebEngineDownloadItem::clickLink(QPoint linkPos)
     QTest::mouseClick(renderWidget, Qt::LeftButton, {}, linkPos);
 }
 
-void tst_QWebEngineDownloadItem::simulateUserAction(QPoint linkPos, UserAction action)
+void tst_QWebEngineDownloadRequest::simulateUserAction(QPoint linkPos, UserAction action)
 {
     switch (action) {
     case SaveLink: return saveLink(linkPos);
@@ -186,17 +179,7 @@ void tst_QWebEngineDownloadItem::simulateUserAction(QPoint linkPos, UserAction a
     }
 }
 
-QWebEngineDownloadItem::DownloadType tst_QWebEngineDownloadItem::expectedDownloadType(
-    UserAction userAction, const QByteArray &contentDisposition)
-{
-    if (userAction == SaveLink)
-        return QWebEngineDownloadItem::UserRequested;
-    if (contentDisposition == QByteArrayLiteral("attachment"))
-        return QWebEngineDownloadItem::Attachment;
-    return QWebEngineDownloadItem::DownloadAttribute;
-}
-
-void tst_QWebEngineDownloadItem::downloadLink_data()
+void tst_QWebEngineDownloadRequest::downloadLink_data()
 {
     QTest::addColumn<UserAction>("userAction");
     QTest::addColumn<bool>("anchorHasDownloadAttribute");
@@ -207,7 +190,6 @@ void tst_QWebEngineDownloadItem::downloadLink_data()
     QTest::addColumn<QByteArray>("fileDisposition");
     QTest::addColumn<bool>("fileHasReferer");
     QTest::addColumn<FileAction>("fileAction");
-    QTest::addColumn<QWebEngineDownloadItem::DownloadType>("downloadType");
 
     // SaveLink should always trigger a download, even for empty files.
     QTest::newRow("save link to empty file")
@@ -393,7 +375,7 @@ void tst_QWebEngineDownloadItem::downloadLink_data()
         /* fileAction                 */ << FileIsDownloaded;
 }
 
-void tst_QWebEngineDownloadItem::downloadLink()
+void tst_QWebEngineDownloadRequest::downloadLink()
 {
     QFETCH(UserAction, userAction);
     QFETCH(bool, anchorHasDownloadAttribute);
@@ -450,31 +432,29 @@ void tst_QWebEngineDownloadItem::downloadLink()
     QUrl downloadUrl = m_server->url(slashFileName);
     int acceptedCount = 0;
     int finishedCount = 0;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
-        QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadRequested);
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
+        QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         QCOMPARE(item->isFinished(), false);
         QCOMPARE(item->totalBytes(), -1);
         QCOMPARE(item->receivedBytes(), 0);
-        QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
-        QCOMPARE(item->type(), expectedDownloadType(userAction, fileDisposition));
+        QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
         QCOMPARE(item->isSavePageDownload(), false);
         QCOMPARE(item->mimeType(), QString(fileMimeTypeDetected));
         QCOMPARE(QDir(item->downloadDirectory()).filePath(item->downloadFileName()), suggestedPath);
-        QCOMPARE(item->savePageFormat(), QWebEngineDownloadItem::UnknownSaveFormat);
+        QCOMPARE(item->savePageFormat(), QWebEngineDownloadRequest::UnknownSaveFormat);
         QCOMPARE(item->url(), downloadUrl);
         QCOMPARE(item->page(), m_page);
 
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadCompleted);
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&, item]() {
+            QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadCompleted);
             QCOMPARE(item->isFinished(), true);
             QCOMPARE(item->totalBytes(), fileContents.size());
             QCOMPARE(item->receivedBytes(), fileContents.size());
-            QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
-            QCOMPARE(item->type(), expectedDownloadType(userAction, fileDisposition));
+            QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
             QCOMPARE(item->isSavePageDownload(), false);
             QCOMPARE(item->mimeType(), QString(fileMimeTypeDetected));
             QCOMPARE(QDir(item->downloadDirectory()).filePath(item->downloadFileName()), downloadPath);
-            QCOMPARE(item->savePageFormat(), QWebEngineDownloadItem::UnknownSaveFormat);
+            QCOMPARE(item->savePageFormat(), QWebEngineDownloadRequest::UnknownSaveFormat);
             QCOMPARE(item->url(), downloadUrl);
             QCOMPARE(item->page(), m_page);
 
@@ -520,7 +500,7 @@ void tst_QWebEngineDownloadItem::downloadLink()
     QCOMPARE(file.readAll(), fileContents);
 }
 
-void tst_QWebEngineDownloadItem::downloadTwoLinks_data()
+void tst_QWebEngineDownloadRequest::downloadTwoLinks_data()
 {
     QTest::addColumn<UserAction>("action1");
     QTest::addColumn<UserAction>("action2");
@@ -530,7 +510,7 @@ void tst_QWebEngineDownloadItem::downloadTwoLinks_data()
     QTest::newRow("Click+Click") << ClickLink << ClickLink;
 }
 
-void tst_QWebEngineDownloadItem::downloadTwoLinks()
+void tst_QWebEngineDownloadRequest::downloadTwoLinks()
 {
     QFETCH(UserAction, action1);
     QFETCH(UserAction, action2);
@@ -563,29 +543,23 @@ void tst_QWebEngineDownloadItem::downloadTwoLinks()
     QString standardDir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
     int acceptedCount = 0;
     int finishedCount = 0;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
-        QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadRequested);
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
+        QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         QCOMPARE(item->isFinished(), false);
         QCOMPARE(item->totalBytes(), -1);
         QCOMPARE(item->receivedBytes(), 0);
-        QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
-        QCOMPARE(item->savePageFormat(), QWebEngineDownloadItem::UnknownSaveFormat);
+        QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
+        QCOMPARE(item->savePageFormat(), QWebEngineDownloadRequest::UnknownSaveFormat);
         QCOMPARE(item->mimeType(), QStringLiteral("text/plain"));
         QString filePart = QChar('/') + item->url().fileName();
         QString fileName =  item->url().fileName();
         QCOMPARE(QDir(item->downloadDirectory()).filePath(item->downloadFileName()), standardDir + filePart);
 
         // type() is broken due to race condition in DownloadManagerDelegateQt
-        if (action1 == ClickLink && action2 == ClickLink) {
-            if (filePart == QStringLiteral("/file1"))
-                QCOMPARE(item->type(), expectedDownloadType(action1));
-            else if (filePart == QStringLiteral("/file2"))
-                QCOMPARE(item->type(), expectedDownloadType(action2, QByteArrayLiteral("attachment")));
-            else
+        if (action1 == ClickLink && action2 == ClickLink && filePart != QStringLiteral("/file1") && filePart != QStringLiteral("/file2"))
                 QFAIL(qPrintable("Unexpected file name: " + filePart));
-        }
 
-        connect(item, &QWebEngineDownloadItem::finished, [&]() {
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&]() {
             finishedCount++;
         });
         item->setDownloadDirectory(tmpDir.path());
@@ -611,20 +585,20 @@ void tst_QWebEngineDownloadItem::downloadTwoLinks()
     QTRY_COMPARE(finishedCount, 2);
 }
 
-void tst_QWebEngineDownloadItem::downloadPage_data()
+void tst_QWebEngineDownloadRequest::downloadPage_data()
 {
     QTest::addColumn<bool>("saveWithPageAction");
-    QTest::addColumn<QWebEngineDownloadItem::SavePageFormat>("savePageFormat");
-    QTest::newRow("SingleHtmlSaveFormat")   << false << QWebEngineDownloadItem::SingleHtmlSaveFormat;
-    QTest::newRow("CompleteHtmlSaveFormat") << false << QWebEngineDownloadItem::CompleteHtmlSaveFormat;
-    QTest::newRow("MimeHtmlSaveFormat")     << false << QWebEngineDownloadItem::MimeHtmlSaveFormat;
-    QTest::newRow("SavePageAction")         << true  << QWebEngineDownloadItem::MimeHtmlSaveFormat;
+    QTest::addColumn<QWebEngineDownloadRequest::SavePageFormat>("savePageFormat");
+    QTest::newRow("SingleHtmlSaveFormat")   << false << QWebEngineDownloadRequest::SingleHtmlSaveFormat;
+    QTest::newRow("CompleteHtmlSaveFormat") << false << QWebEngineDownloadRequest::CompleteHtmlSaveFormat;
+    QTest::newRow("MimeHtmlSaveFormat")     << false << QWebEngineDownloadRequest::MimeHtmlSaveFormat;
+    QTest::newRow("SavePageAction")         << true  << QWebEngineDownloadRequest::MimeHtmlSaveFormat;
 }
 
-void tst_QWebEngineDownloadItem::downloadPage()
+void tst_QWebEngineDownloadRequest::downloadPage()
 {
     QFETCH(bool, saveWithPageAction);
-    QFETCH(QWebEngineDownloadItem::SavePageFormat, savePageFormat);
+    QFETCH(QWebEngineDownloadRequest::SavePageFormat, savePageFormat);
 
     // Set up HTTP server
     int indexRequestCount = 0;
@@ -644,13 +618,12 @@ void tst_QWebEngineDownloadItem::downloadPage()
     QUrl downloadUrl = m_server->url("/");
     int acceptedCount = 0;
     int finishedCount = 0;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
-        QCOMPARE(item->state(), saveWithPageAction ? QWebEngineDownloadItem::DownloadRequested : QWebEngineDownloadItem::DownloadInProgress);
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
+        QCOMPARE(item->state(), saveWithPageAction ? QWebEngineDownloadRequest::DownloadRequested : QWebEngineDownloadRequest::DownloadInProgress);
         QCOMPARE(item->isFinished(), false);
         QCOMPARE(item->totalBytes(), -1);
         QCOMPARE(item->receivedBytes(), 0);
-        QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
-        QCOMPARE(item->type(), QWebEngineDownloadItem::SavePage);
+        QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
         QCOMPARE(item->isSavePageDownload(), true);
         // FIXME(juvaldma): why is mimeType always the same?
         QCOMPARE(item->mimeType(), QStringLiteral("application/x-mimearchive"));
@@ -668,13 +641,12 @@ void tst_QWebEngineDownloadItem::downloadPage()
 
         QCOMPARE(QDir(item->downloadDirectory()).filePath(item->downloadFileName()), downloadPath);
 
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadCompleted);
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&, item]() {
+            QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadCompleted);
             QCOMPARE(item->isFinished(), true);
             QCOMPARE(item->totalBytes(), item->receivedBytes());
             QVERIFY(item->receivedBytes() > 0);
-            QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
-            QCOMPARE(item->type(), QWebEngineDownloadItem::SavePage);
+            QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
             QCOMPARE(item->isSavePageDownload(), true);
             QCOMPARE(item->mimeType(), QStringLiteral("application/x-mimearchive"));
             QCOMPARE(QDir(item->downloadDirectory()).filePath(item->downloadFileName()), downloadPath);
@@ -707,7 +679,7 @@ void tst_QWebEngineDownloadItem::downloadPage()
     QVERIFY(file.exists());
 }
 
-void tst_QWebEngineDownloadItem::downloadViaSetUrl()
+void tst_QWebEngineDownloadRequest::downloadViaSetUrl()
 {
     // Reproduce the scenario described in QTBUG-63388 by triggering downloads
     // of the same file multiple times via QWebEnginePage::setUrl
@@ -726,8 +698,8 @@ void tst_QWebEngineDownloadItem::downloadViaSetUrl()
     });
 
     // Set up profile and download handler
-    QVector<QUrl> downloadUrls;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    QList<QUrl> downloadUrls;
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         downloadUrls.append(item->url());
     });
 
@@ -758,7 +730,7 @@ void tst_QWebEngineDownloadItem::downloadViaSetUrl()
     }
 }
 
-void tst_QWebEngineDownloadItem::downloadFileNot1()
+void tst_QWebEngineDownloadRequest::downloadFileNot1()
 {
     // Trigger file download via download() but don't accept().
 
@@ -766,11 +738,11 @@ void tst_QWebEngineDownloadItem::downloadFileNot1()
         rr->sendResponse(404);
     });
 
-    QPointer<QWebEngineDownloadItem> downloadItem;
+    QPointer<QWebEngineDownloadRequest> downloadItem;
     int downloadCount = 0;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         QVERIFY(item);
-        QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadRequested);
+        QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         downloadItem = item;
         downloadCount++;
     });
@@ -780,7 +752,7 @@ void tst_QWebEngineDownloadItem::downloadFileNot1()
     QVERIFY(!downloadItem);
 }
 
-void tst_QWebEngineDownloadItem::downloadFileNot2()
+void tst_QWebEngineDownloadRequest::downloadFileNot2()
 {
     // Trigger file download via download() but call cancel() instead of accept().
 
@@ -788,11 +760,11 @@ void tst_QWebEngineDownloadItem::downloadFileNot2()
         rr->sendResponse(404);
     });
 
-    QPointer<QWebEngineDownloadItem> downloadItem;
+    QPointer<QWebEngineDownloadRequest> downloadItem;
     int downloadCount = 0;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         QVERIFY(item);
-        QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadRequested);
+        QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         item->cancel();
         downloadItem = item;
         downloadCount++;
@@ -801,19 +773,19 @@ void tst_QWebEngineDownloadItem::downloadFileNot2()
     m_page->download(m_server->url(QByteArrayLiteral("/file")));
     QTRY_COMPARE(downloadCount, 1);
     QVERIFY(downloadItem);
-    QCOMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled);
+    QCOMPARE(downloadItem->state(), QWebEngineDownloadRequest::DownloadCancelled);
 }
 
-void tst_QWebEngineDownloadItem::downloadDeleted()
+void tst_QWebEngineDownloadRequest::downloadDeleted()
 {
-    QPointer<QWebEngineDownloadItem> downloadItem;
+    QPointer<QWebEngineDownloadRequest> downloadItem;
     int downloadCount = 0, finishedCount = 0;
 
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         QVERIFY(item);
-        QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadRequested);
+        QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadRequested);
         downloadItem = item;
-        connect(downloadItem, &QWebEngineDownloadItem::finished, [&]() { ++finishedCount; });
+        connect(downloadItem, &QWebEngineDownloadRequest::isFinishedChanged, [&]() { ++finishedCount; });
         ++downloadCount;
         // accept and schedule deletion, and check if it still finishes
         item->accept();
@@ -829,16 +801,16 @@ void tst_QWebEngineDownloadItem::downloadDeleted()
     QCOMPARE(finishedCount, 1);
 }
 
-void tst_QWebEngineDownloadItem::downloadDeletedByProfile()
+void tst_QWebEngineDownloadRequest::downloadDeletedByProfile()
 {
     QPointer<QWebEngineProfile> profile(new QWebEngineProfile);
     profile->setHttpCacheType(QWebEngineProfile::NoCache);
     profile->settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
 
     bool downloadFinished = false;
-    QPointer<QWebEngineDownloadItem> downloadItem;
-    connect(profile, &QWebEngineProfile::downloadRequested, [&] (QWebEngineDownloadItem *item) {
-        connect(item, &QWebEngineDownloadItem::finished, [&] () {
+    QPointer<QWebEngineDownloadRequest> downloadItem;
+    connect(profile, &QWebEngineProfile::downloadRequested, [&] (QWebEngineDownloadRequest *item) {
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&] () {
             downloadFinished = true;
         });
         downloadItem = item;
@@ -858,7 +830,7 @@ void tst_QWebEngineDownloadItem::downloadDeletedByProfile()
     QTRY_COMPARE(downloadItem.isNull(), true);
 }
 
-void tst_QWebEngineDownloadItem::downloadUniqueFilename_data()
+void tst_QWebEngineDownloadRequest::downloadUniqueFilename_data()
 {
     QTest::addColumn<QString>("baseName");
     QTest::addColumn<QString>("extension");
@@ -867,7 +839,7 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilename_data()
     QTest::newRow("tar.gz") << QString("test(1.test)") << QString("tar.gz");
 }
 
-void tst_QWebEngineDownloadItem::downloadUniqueFilename()
+void tst_QWebEngineDownloadRequest::downloadUniqueFilename()
 {
     QFETCH(QString, baseName);
     QFETCH(QString, extension);
@@ -882,7 +854,8 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilename()
 
     // Set up HTTP server
     ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
-        if (rr->requestMethod() == "GET" && rr->requestPath() == ("/" + fileName)) {
+        auto requestPath = QString::fromUtf8(rr->requestPath());
+        if (rr->requestMethod() == "GET" && requestPath == ("/" + fileName)) {
             rr->setResponseHeader(QByteArrayLiteral("content-type"), QByteArrayLiteral("application/octet-stream"));
             rr->setResponseHeader(QByteArrayLiteral("content-disposition"), QByteArrayLiteral("attachment"));
             rr->setResponseBody(QByteArrayLiteral("a"));
@@ -893,16 +866,15 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilename()
     });
 
     // Set up profile and download handler
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         suggestedFileName = item->suggestedFileName();
         item->accept();
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadCompleted);
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&, item]() {
+            QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadCompleted);
             QCOMPARE(item->isFinished(), true);
             QCOMPARE(item->totalBytes(), item->receivedBytes());
             QVERIFY(item->receivedBytes() > 0);
-            QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
-            QCOMPARE(item->type(), QWebEngineDownloadItem::Attachment);
+            QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
             QCOMPARE(item->isSavePageDownload(), false);
             downloadedFilePath = QDir(item->downloadDirectory()).filePath(item->downloadFileName());
             downloadFinished = true;
@@ -924,7 +896,7 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilename()
     }
 }
 
-void tst_QWebEngineDownloadItem::downloadUniqueFilenameWithTimestamp()
+void tst_QWebEngineDownloadRequest::downloadUniqueFilenameWithTimestamp()
 {
     // Set up HTTP server
     QString baseName("test(1.test)");
@@ -939,7 +911,8 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilenameWithTimestamp()
     m_profile->setDownloadPath(tmpDir.path());
 
     ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
-        if (rr->requestMethod() == "GET" && rr->requestPath() == ("/" + fileName)) {
+        auto requestPath = QString::fromUtf8(rr->requestPath());
+        if (rr->requestMethod() == "GET" && requestPath == ("/" + fileName)) {
             rr->setResponseHeader(QByteArrayLiteral("content-type"), QByteArrayLiteral("application/octet-stream"));
             rr->setResponseHeader(QByteArrayLiteral("content-disposition"), QByteArrayLiteral("attachment"));
             rr->setResponseBody(QByteArrayLiteral("a"));
@@ -950,15 +923,15 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilenameWithTimestamp()
     });
 
     // Set up profile and download handler
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         suggestedFileName = item->suggestedFileName();
         item->accept();
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadCompleted);
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&, item]() {
+            QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadCompleted);
             QCOMPARE(item->isFinished(), true);
             QCOMPARE(item->totalBytes(), item->receivedBytes());
             QVERIFY(item->receivedBytes() > 0);
-            QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
+            QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
             QCOMPARE(item->page(), m_page);
             downloadFinished = true;
             downloadedFilePath = QDir(item->downloadDirectory()).filePath(item->downloadFileName());
@@ -1002,7 +975,7 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilenameWithTimestamp()
     }
 }
 
-void tst_QWebEngineDownloadItem::downloadToDefaultLocation()
+void tst_QWebEngineDownloadRequest::downloadToDefaultLocation()
 {
     QTemporaryDir tmpDir;
     QVERIFY(tmpDir.isValid());
@@ -1019,7 +992,7 @@ void tst_QWebEngineDownloadItem::downloadToDefaultLocation()
     QCOMPARE(m_profile->downloadPath(), QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
 }
 
-void tst_QWebEngineDownloadItem::downloadToNonExistentDir()
+void tst_QWebEngineDownloadRequest::downloadToNonExistentDir()
 {
     QString baseName("test(1.test)");
     QString extension("txt");
@@ -1034,7 +1007,8 @@ void tst_QWebEngineDownloadItem::downloadToNonExistentDir()
 
     // Set up HTTP server
     ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
-        if (rr->requestMethod() == "GET" && rr->requestPath() == ("/" + fileName)) {
+        auto requestPath = QString::fromUtf8(rr->requestPath());
+        if (rr->requestMethod() == "GET" && requestPath == ("/" + fileName)) {
             rr->setResponseHeader(QByteArrayLiteral("content-type"), QByteArrayLiteral("application/octet-stream"));
             rr->setResponseHeader(QByteArrayLiteral("content-disposition"), QByteArrayLiteral("attachment"));
             rr->setResponseBody(QByteArrayLiteral("a"));
@@ -1045,15 +1019,15 @@ void tst_QWebEngineDownloadItem::downloadToNonExistentDir()
     });
 
     // Set up profile and download handler
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         suggestedFileName = item->suggestedFileName();
         item->accept();
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadCompleted);
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&, item]() {
+            QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadCompleted);
             QCOMPARE(item->isFinished(), true);
             QCOMPARE(item->totalBytes(), item->receivedBytes());
             QVERIFY(item->receivedBytes() > 0);
-            QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
+            QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
             QCOMPARE(item->page(), m_page);
             downloadFinished = true;
             downloadedFilePath = QDir(item->downloadDirectory()).filePath(item->downloadFileName());
@@ -1071,7 +1045,7 @@ void tst_QWebEngineDownloadItem::downloadToNonExistentDir()
     QCOMPARE(suggestedFileName, fileName);
 }
 
-void tst_QWebEngineDownloadItem::downloadToReadOnlyDir()
+void tst_QWebEngineDownloadRequest::downloadToReadOnlyDir()
 {
 #ifdef Q_OS_WIN
     QSKIP("Cannot change file permissions on Windows.");
@@ -1090,7 +1064,8 @@ void tst_QWebEngineDownloadItem::downloadToReadOnlyDir()
 
     // Set up HTTP server
     ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
-        if (rr->requestMethod() == "GET" && rr->requestPath() == ("/" + fileName)) {
+        auto requestPath = QString::fromUtf8(rr->requestPath());
+        if (rr->requestMethod() == "GET" && requestPath == ("/" + fileName)) {
             rr->setResponseHeader(QByteArrayLiteral("content-type"), QByteArrayLiteral("application/octet-stream"));
             rr->setResponseHeader(QByteArrayLiteral("content-disposition"), QByteArrayLiteral("attachment"));
             rr->setResponseBody(QByteArrayLiteral("a"));
@@ -1100,12 +1075,12 @@ void tst_QWebEngineDownloadItem::downloadToReadOnlyDir()
         }
     });
 
-    QPointer<QWebEngineDownloadItem> downloadItem;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    QPointer<QWebEngineDownloadRequest> downloadItem;
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
         suggestedFileName = item->suggestedFileName();
         downloadItem = item;
         item->accept();
-        connect(item, &QWebEngineDownloadItem::finished, [&]() {
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&]() {
             downloadFinished = true;
         });
         downloadAccepted = true;
@@ -1119,9 +1094,9 @@ void tst_QWebEngineDownloadItem::downloadToReadOnlyDir()
     QTRY_VERIFY(downloadAccepted);
 
     QVERIFY(downloadItem);
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadInterrupted);
+    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadRequest::DownloadInterrupted);
     QCOMPARE(downloadItem->isFinished(), false);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::FileAccessDenied);
+    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadRequest::FileAccessDenied);
     QVERIFY(!QFile(downloadedFilePath).exists());
     QCOMPARE(suggestedFileName, fileName);
 
@@ -1131,125 +1106,7 @@ void tst_QWebEngineDownloadItem::downloadToReadOnlyDir()
     QFile(m_profile->downloadPath()).setPermissions(QFileDevice::WriteOwner);
 }
 
-#if QT_DEPRECATED_SINCE(5, 14)
-void tst_QWebEngineDownloadItem::downloadPathValidation()
-{
-    const QString fileName = "test.txt";
-    QString downloadPath;
-    QString originalDownloadPath;
-
-    QTemporaryDir tmpDir;
-    QVERIFY(tmpDir.isValid());
-    m_profile->setDownloadPath(tmpDir.path());
-
-    // Set up HTTP server
-    ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
-        if (rr->requestMethod() == "GET" && rr->requestPath() == ("/" + fileName)) {
-            rr->setResponseHeader(QByteArrayLiteral("content-type"), QByteArrayLiteral("application/octet-stream"));
-            rr->setResponseHeader(QByteArrayLiteral("content-disposition"), QByteArrayLiteral("attachment"));
-            rr->setResponseBody(QByteArrayLiteral("a"));
-            rr->sendResponse();
-        } else {
-            rr->sendResponse(404);
-        }
-    });
-
-    // Set up profile and download handler
-    QPointer<QWebEngineDownloadItem> downloadItem;
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
-        downloadItem = item;
-        originalDownloadPath = item->path();
-
-        item->setPath(downloadPath);
-        item->accept();
-
-        connect(item, &QWebEngineDownloadItem::stateChanged, [&, item](QWebEngineDownloadItem::DownloadState downloadState) {
-            if (downloadState == QWebEngineDownloadItem::DownloadInterrupted) {
-                item->cancel();
-            }
-        });
-
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->isFinished(), true);
-            QCOMPARE(item->totalBytes(), item->receivedBytes());
-            QVERIFY(item->receivedBytes() > 0);
-            QCOMPARE(item->page(), m_page);
-        });
-    });
-
-    QString oldPath = QDir::currentPath();
-    QDir::setCurrent(tmpDir.path());
-
-    // Set only the file name.
-    downloadItem.clear();
-    originalDownloadPath = "";
-    downloadPath = fileName;
-    m_page->setUrl(m_server->url("/" + fileName));
-    QTRY_VERIFY(downloadItem);
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason);
-    QCOMPARE(downloadItem->path(), fileName);
-
-    // Set only the directory path.
-    downloadItem.clear();
-    originalDownloadPath = "";
-    downloadPath = tmpDir.path();
-    m_page->setUrl(m_server->url("/" + fileName));
-    QTRY_VERIFY(downloadItem);
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason);
-    QCOMPARE(downloadItem->path(), originalDownloadPath);
-
-    // Set only the directory path with separator.
-    downloadItem.clear();
-    originalDownloadPath = "";
-    downloadPath = tmpDir.path() + QDir::separator();
-    m_page->setUrl(m_server->url("/" + fileName));
-    QTRY_VERIFY(downloadItem);
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason);
-    QCOMPARE(downloadItem->path(), originalDownloadPath);
-
-    // Set only the directory with the current directory path without ending separator.
-    downloadItem.clear();
-    originalDownloadPath = "";
-    downloadPath = ".";
-    m_page->setUrl(m_server->url("/" + fileName));
-    QTRY_VERIFY(downloadItem);
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason);
-    QCOMPARE(downloadItem->path(), originalDownloadPath);
-
-    // Set only the directory with the current directory path with ending separator.
-    downloadItem.clear();
-    originalDownloadPath = "";
-    downloadPath = "./";
-    m_page->setUrl(m_server->url("/" + fileName));
-    QTRY_VERIFY(downloadItem);
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason);
-    QCOMPARE(downloadItem->path(), originalDownloadPath);
-
-    downloadItem.clear();
-    originalDownloadPath = "";
-    downloadPath = "...";
-    m_page->setUrl(m_server->url("/" + fileName));
-    QTRY_VERIFY(downloadItem);
-#if !defined(Q_OS_WIN)
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::FileFailed);
-    QCOMPARE(downloadItem->path(), downloadPath);
-#else
-    // Windows interprets the "..." path as a valid path. It will be the current path.
-    QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted);
-    QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason);
-    QCOMPARE(downloadItem->path(), originalDownloadPath);
-#endif // !defined(Q_OS_WIN)
-    QDir::setCurrent(oldPath);
-}
-#endif
-
-void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName_data()
+void tst_QWebEngineDownloadRequest::downloadToDirectoryWithFileName_data()
 {
     QTest::addColumn<bool>("setDirectoryFirst");
 
@@ -1257,7 +1114,7 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName_data()
     QTest::newRow("setFileNameFirst") << false;
 }
 
-void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
+void tst_QWebEngineDownloadRequest::downloadToDirectoryWithFileName()
 {
     QFETCH(bool, setDirectoryFirst);
     QString downloadDirectory;
@@ -1275,7 +1132,8 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
 
     // Set up HTTP server
     ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
-        if (rr->requestMethod() == "GET" && rr->requestPath() == ("/" + fileName)) {
+        auto requestPath = QString::fromUtf8(rr->requestPath());
+        if (rr->requestMethod() == "GET" && requestPath == ("/" + fileName)) {
             rr->setResponseHeader(QByteArrayLiteral("content-type"), QByteArrayLiteral("application/octet-stream"));
             rr->setResponseHeader(QByteArrayLiteral("content-disposition"), QByteArrayLiteral("attachment"));
             rr->setResponseBody(QByteArrayLiteral("a"));
@@ -1286,7 +1144,7 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
     });
 
     // Set up profile and download handler
-    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
+    ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadRequest *item) {
 
         if (!downloadDirectory.isEmpty() && setDirectoryFirst) {
             item->setDownloadDirectory(downloadDirectory);
@@ -1303,15 +1161,14 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
             QCOMPARE(item->downloadDirectory(), downloadDirectory);
         }
 
-        QCOMPARE(item->path(), QDir(item->downloadDirectory()).filePath(item->downloadFileName()));
         item->accept();
 
-        connect(item, &QWebEngineDownloadItem::finished, [&, item]() {
-            QCOMPARE(item->state(), QWebEngineDownloadItem::DownloadCompleted);
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged, [&, item]() {
+            QCOMPARE(item->state(), QWebEngineDownloadRequest::DownloadCompleted);
             QCOMPARE(item->isFinished(), true);
             QCOMPARE(item->totalBytes(), item->receivedBytes());
             QVERIFY(item->receivedBytes() > 0);
-            QCOMPARE(item->interruptReason(), QWebEngineDownloadItem::NoReason);
+            QCOMPARE(item->interruptReason(), QWebEngineDownloadRequest::NoReason);
             QCOMPARE(item->page(), m_page);
             downloadFinished = true;
             downloadedFilePath = QDir(item->downloadDirectory()).filePath(item->downloadFileName());
@@ -1349,7 +1206,7 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
     QCOMPARE(downloadedSuggestedFileName, fileName);
 
     // Download another file to the same directory and set file name by
-    // QWebEngineDownloadItem::setDownloadDirectory() and setDownloadFileName() to avoid uniquification.
+    // QWebEngineDownloadRequest::setDownloadDirectory() and setDownloadFileName() to avoid uniquification.
     downloadFinished = false;
     downloadDirectory = m_profile->downloadPath() + QDir::separator() + "test1"  + QDir::separator();
     downloadFileName = "test1.txt";
@@ -1370,7 +1227,7 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
     QCOMPARE(downloadedSuggestedFileName, fileName);
 
     // Download the same file to same directory and set file name by
-    // QWebEngineDownloadItem::setDownloadDirectory() and setDownloadFileName() to avoid uniquification.
+    // QWebEngineDownloadRequest::setDownloadDirectory() and setDownloadFileName() to avoid uniquification.
     downloadFinished = false;
     downloadDirectory = m_profile->downloadPath() + QDir::separator() + "test2"  + QDir::separator();
     downloadFileName = "test1.txt";
@@ -1392,5 +1249,5 @@ void tst_QWebEngineDownloadItem::downloadToDirectoryWithFileName()
     QCOMPARE(downloadedSuggestedFileName, fileName);
 }
 
-QTEST_MAIN(tst_QWebEngineDownloadItem)
-#include "tst_qwebenginedownloaditem.moc"
+QTEST_MAIN(tst_QWebEngineDownloadRequest)
+#include "tst_qwebenginedownloadrequest.moc"
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 040114258..f530fefbb 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -31,11 +31,12 @@
 #include <QMenu>
 #include <QMimeDatabase>
 #include <QNetworkProxy>
-#include <QOpenGLWidget>
 #include <QPaintEngine>
 #include <QPushButton>
 #include <QScreen>
-#include <QStateMachine>
+#if defined(QT_STATEMACHINE_LIB)
+#    include <QStateMachine>
+#endif
 #include <QtGui/QClipboard>
 #include <QtTest/QtTest>
 #include <QTextCharFormat>
@@ -46,7 +47,7 @@
 #include <qnetworkcookiejar.h>
 #include <qnetworkreply.h>
 #include <qnetworkrequest.h>
-#include <qwebenginedownloaditem.h>
+#include <qwebenginedownloadrequest.h>
 #include <qwebenginefindtextresult.h>
 #include <qwebenginefullscreenrequest.h>
 #include <qwebenginehistory.h>
@@ -130,8 +131,10 @@ private Q_SLOTS:
     void findTextCalledOnMatch();
     void findTextActiveMatchOrdinal();
     void deleteQWebEngineViewTwice();
+#if defined(QT_STATEMACHINE_LIB)
     void loadSignalsOrder_data();
     void loadSignalsOrder();
+#endif
     void openWindowDefaultSize();
 
 #ifdef Q_OS_MAC
@@ -1068,11 +1071,11 @@ void tst_QWebEnginePage::findText()
 void tst_QWebEnginePage::findTextResult()
 {
     QSignalSpy findTextSpy(m_view->page(), &QWebEnginePage::findTextFinished);
-    auto signalResult = [&findTextSpy]() -> QVector<int> {
+    auto signalResult = [&findTextSpy]() -> QList<int> {
         if (findTextSpy.count() != 1)
-            return QVector<int>({-1, -1});
+            return QList<int>({-1, -1});
         auto r = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
-        return QVector<int>({ r.numberOfMatches(), r.activeMatch() });
+        return QList<int>({ r.numberOfMatches(), r.activeMatch() });
     };
 
     // findText will abort in blink if the view has an empty size.
@@ -1084,21 +1087,21 @@ void tst_QWebEnginePage::findTextResult()
     QTRY_COMPARE(loadSpy.count(), 1);
 
     QCOMPARE(findTextSync(m_page, ""), false);
-    QCOMPARE(signalResult(), QVector<int>({0, 0}));
+    QCOMPARE(signalResult(), QList<int>({0, 0}));
 
     const QStringList words = { "foo", "bar" };
     for (const QString &subString : words) {
         QCOMPARE(findTextSync(m_page, subString), true);
-        QCOMPARE(signalResult(), QVector<int>({1, 1}));
+        QCOMPARE(signalResult(), QList<int>({1, 1}));
 
         QCOMPARE(findTextSync(m_page, ""), false);
-        QCOMPARE(signalResult(), QVector<int>({0, 0}));
+        QCOMPARE(signalResult(), QList<int>({0, 0}));
     }
 
     QCOMPARE(findTextSync(m_page, "blahhh"), false);
-    QCOMPARE(signalResult(), QVector<int>({0, 0}));
+    QCOMPARE(signalResult(), QList<int>({0, 0}));
     QCOMPARE(findTextSync(m_page, ""), false);
-    QCOMPARE(signalResult(), QVector<int>({0, 0}));
+    QCOMPARE(signalResult(), QList<int>({0, 0}));
 }
 
 void tst_QWebEnginePage::findTextSuccessiveShouldCallAllCallbacks()
@@ -1357,6 +1360,8 @@ void tst_QWebEnginePage::deleteQWebEngineViewTwice()
     }
 }
 
+// TODO: Reimplement test without QStateMachine or add qtscxml module dependency
+#if defined(QT_STATEMACHINE_LIB)
 class SpyForLoadSignalsOrder : public QStateMachine {
     Q_OBJECT
 public:
@@ -1414,6 +1419,7 @@ void tst_QWebEnginePage::loadSignalsOrder()
     page.load(url);
     QTRY_VERIFY_WITH_TIMEOUT(loadSpy.isFinished(), 20000);
 }
+#endif // defined(QT_STATEMACHINE_LIB)
 
 void tst_QWebEnginePage::renderWidgetHostViewNotShowTopLevel()
 {
@@ -1680,9 +1686,9 @@ void tst_QWebEnginePage::savePage()
     QWebEnginePage *page = view.page();
 
     connect(page->profile(), &QWebEngineProfile::downloadRequested,
-            [] (QWebEngineDownloadItem *item)
+            [] (QWebEngineDownloadRequest *item)
     {
-        connect(item, &QWebEngineDownloadItem::finished,
+        connect(item, &QWebEngineDownloadRequest::isFinishedChanged,
                 &QTestEventLoop::instance(), &QTestEventLoop::exitLoop, Qt::QueuedConnection);
     });
 
@@ -1696,7 +1702,7 @@ void tst_QWebEnginePage::savePage()
     // Save the loaded page as HTML.
     QTemporaryDir tempDir(QDir::tempPath() + "/tst_qwebengineview-XXXXXX");
     const QString filePath = tempDir.path() + "/thingumbob.html";
-    page->save(filePath, QWebEngineDownloadItem::CompleteHtmlSaveFormat);
+    page->save(filePath, QWebEngineDownloadRequest::CompleteHtmlSaveFormat);
     QTestEventLoop::instance().enterLoop(10);
 
     // Load something else.
@@ -2057,7 +2063,7 @@ private Q_SLOTS:
 
     void continueError()
     {
-        emit error(this->error());
+        emit errorOccurred(this->error());
         emit finished();
     }
 };
@@ -2413,9 +2419,13 @@ void tst_QWebEnginePage::setContent_data()
     QString str = QString::fromUtf8("ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει");
     QTest::newRow("UTF-8 plain text") << "text/plain; charset=utf-8" << str.toUtf8() << str;
 
-    QTextCodec *utf16 = QTextCodec::codecForName("UTF-16");
-    if (utf16)
-        QTest::newRow("UTF-16 plain text") << "text/plain; charset=utf-16" << utf16->fromUnicode(str) << str;
+    QBuffer out16;
+    out16.open(QIODevice::WriteOnly);
+    QTextStream stream16(&out16);
+    stream16.setEncoding(QStringConverter::Utf16);
+    stream16 << str;
+    stream16.flush();
+    QTest::newRow("UTF-16 plain text") << "text/plain; charset=utf-16" << out16.buffer() << str;
 
     str = QString::fromUtf8("Une chaîne de caractères à sa façon.");
     QTest::newRow("latin-1 plain text") << "text/plain; charset=iso-8859-1" << str.toLatin1() << str;
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index f4c0484eb..544fb8a11 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -35,11 +35,11 @@
 #include <QtWebEngineCore/qwebenginecookiestore.h>
 #include <QtWebEngineCore/qwebengineurlscheme.h>
 #include <QtWebEngineCore/qwebengineurlschemehandler.h>
+#include <QtWebEngineCore/qwebenginesettings.h>
 #include <QtWebEngineWidgets/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
-#include <QtWebEngineWidgets/qwebenginesettings.h>
 #include <QtWebEngineWidgets/qwebengineview.h>
-#include <QtWebEngineWidgets/qwebenginedownloaditem.h>
+#include <QtWebEngineCore/qwebenginedownloadrequest.h>
 
 #if QT_CONFIG(webengine_webchannel)
 #include <QWebChannel>
@@ -832,10 +832,10 @@ void tst_QWebEngineProfile::httpAcceptLanguage()
 
 void tst_QWebEngineProfile::downloadItem()
 {
-    qRegisterMetaType<QWebEngineDownloadItem *>();
+    qRegisterMetaType<QWebEngineDownloadRequest *>();
     QWebEngineProfile testProfile;
     QWebEnginePage page(&testProfile);
-    QSignalSpy downloadSpy(&testProfile, SIGNAL(downloadRequested(QWebEngineDownloadItem *)));
+    QSignalSpy downloadSpy(&testProfile, SIGNAL(downloadRequested(QWebEngineDownloadRequest *)));
     page.load(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()));
     QTRY_COMPARE(downloadSpy.count(), 1);
 }
@@ -871,7 +871,7 @@ void tst_QWebEngineProfile::changeHttpUserAgent()
     TestServer server;
     QVERIFY(server.start());
 
-    QVector<QByteArray> userAgents;
+    QList<QByteArray> userAgents;
     connect(&server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
         if (rr->requestPath() == "/hedgehog.html")
             userAgents.push_back(rr->requestHeader(QByteArrayLiteral("user-agent")));
@@ -898,7 +898,7 @@ void tst_QWebEngineProfile::changeHttpAcceptLanguage()
     TestServer server;
     QVERIFY(server.start());
 
-    QVector<QByteArray> languages;
+    QList<QByteArray> languages;
     connect(&server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
         if (rr->requestPath() == "/hedgehog.html")
             languages.push_back(rr->requestHeader(QByteArrayLiteral("accept-language")));
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 32384aec2..5e7bd2453 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -320,8 +320,8 @@ void tst_QWebEngineScript::scriptModifications()
     QVERIFY(spyFinished.wait());
     QCOMPARE(evaluateJavaScriptSync(&page, "document.body.innerText"), QVariant::fromValue(QStringLiteral("SUCCESS")));
     QVERIFY(page.scripts().count() == 1);
-    QWebEngineScript s = page.scripts().findScript(QStringLiteral("String1"));
-    QVERIFY(page.scripts().remove(s));
+    QList<QWebEngineScript> s = page.scripts().find(QStringLiteral("String1"));
+    QVERIFY(page.scripts().remove(s.first()));
     QVERIFY(page.scripts().count() == 0);
 }
 
diff --git a/tests/auto/widgets/qwebenginesettings/BLACKLIST b/tests/auto/widgets/qwebenginesettings/BLACKLIST
new file mode 100644
index 000000000..d4a35a76a
--- /dev/null
+++ b/tests/auto/widgets/qwebenginesettings/BLACKLIST
@@ -0,0 +1,2 @@
+[javascriptClipboard]
+ubuntu-20.04
diff --git a/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp b/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp
index a09901e69..a7c3ccb3c 100644
--- a/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp
+++ b/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp
@@ -177,7 +177,7 @@ void tst_QWebEngineSettings::setInAcceptNavigationRequest()
 {
     NavigationRequestOverride page;
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
-    QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
+    QWebEngineProfile::defaultProfile()->settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
     QVERIFY(!page.settings()->testAttribute(QWebEngineSettings::JavascriptEnabled));
 
     page.load(QUrl("about:blank"));
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 5e16361c5..f905234e3 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -29,8 +29,9 @@
 #include <qwebengineview.h>
 #include <qwebenginepage.h>
 #include <qwebenginesettings.h>
-#include <qnetworkrequest.h>
+#include <qaction.h>
 #include <qdiriterator.h>
+#include <qnetworkrequest.h>
 #include <qstackedlayout.h>
 #include <qtemporarydir.h>
 #include <QClipboard>
@@ -45,7 +46,6 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QStyle>
-#include <QtWidgets/qaction.h>
 #include <QWebEngineProfile>
 #include <QtCore/qregularexpression.h>
 
@@ -60,7 +60,7 @@ do { \
     QCOMPARE((__expr), __expected); \
 } while (0)
 
-static QTouchDevice* s_touchDevice = nullptr;
+static QPointingDevice* s_touchDevice = nullptr;
 
 static QPoint elementCenter(QWebEnginePage *page, const QString &id)
 {
@@ -350,7 +350,7 @@ void tst_QWebEngineView::changePage()
     if (!fromIsNullPage) {
         QVERIFY(!pageFrom->iconUrl().isEmpty());
         QCOMPARE(spyIconUrl.last().value(0).toUrl(), pageFrom->iconUrl());
-        QCOMPARE(spyIcon.last().value(0), QVariant::fromValue(pageFrom->icon()));
+        QCOMPARE(spyIcon.last().value(0).value<QIcon>(), pageFrom->icon());
     }
 
     QScopedPointer<QWebEnginePage> pageTo(new QWebEnginePage);
@@ -379,7 +379,7 @@ void tst_QWebEngineView::changePage()
     QCOMPARE(pageFrom->iconUrl() == pageTo->iconUrl(), iconIsSame);
     if (!iconIsSame) {
         QCOMPARE(spyIconUrl.last().value(0).toUrl(), pageTo->iconUrl());
-        QCOMPARE(spyIcon.last().value(0), QVariant::fromValue(pageTo->icon()));
+        QCOMPARE(spyIcon.last().value(0).value<QIcon>(), pageTo->icon());
     }
 
     // verify no emits on destroy with the same number of signals in spy
@@ -961,7 +961,7 @@ public:
 
 private:
     int m_eventCounter;
-    QVector<QString> m_eventHistory;
+    QList<QString> m_eventHistory;
 };
 
 void tst_QWebEngineView::doNotSendMouseKeyboardEventsWhenDisabled()
diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
index 801e2a76c..62007840f 100644
--- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
@@ -28,7 +28,6 @@
 
 #include "util.h"
 #include <QtTest/QtTest>
-#include <QtWebEngineWidgets/qwebenginecontextmenudata.h>
 #include <QtWebEngineWidgets/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
 #include <QtWebEngineWidgets/qwebengineview.h>
@@ -47,10 +46,7 @@ public:
         QTest::mouseRelease(widget, Qt::RightButton, {}, position);
     }
 
-    const QWebEngineContextMenuData& data()
-    {
-        return m_data;
-    }
+    QWebEngineContextMenuRequest *data() { return m_data; }
 
 signals:
     void menuReady();
@@ -58,11 +54,11 @@ signals:
 protected:
     void contextMenuEvent(QContextMenuEvent *)
     {
-        m_data = page()->contextMenuData();
+        m_data = lastContextMenuRequest();
         emit menuReady();
     }
 private:
-    QWebEngineContextMenuData m_data;
+    QWebEngineContextMenuRequest *m_data;
 };
 
 class tst_Spellchecking : public QObject
@@ -204,17 +200,17 @@ void tst_Spellchecking::spellcheck()
             return false;
         }
 
-        if (!m_view->data().isValid()) {
+        if (!m_view->data()) {
             detail = "invalid data";
             return false;
         }
 
-        if (!m_view->data().isContentEditable()) {
+        if (!m_view->data()->isContentEditable()) {
             detail = "content is not editable";
             return false;
         }
 
-        if (m_view->data().misspelledWord().isEmpty()) {
+        if (m_view->data()->misspelledWord().isEmpty()) {
             detail = "no misspelled word";
             return false;
         };
@@ -224,10 +220,10 @@ void tst_Spellchecking::spellcheck()
     } (), qPrintable(QString("Context menu: %1").arg(detail)));
 
     // check misspelled word
-    QCOMPARE(m_view->data().misspelledWord(), QStringLiteral("lowe"));
+    QCOMPARE(m_view->data()->misspelledWord(), QStringLiteral("lowe"));
 
     // check suggestions
-    QCOMPARE(m_view->data().spellCheckerSuggestions(), suggestions);
+    QCOMPARE(m_view->data()->spellCheckerSuggestions(), suggestions);
 
     // check replace word
     m_view->page()->replaceMisspelledWord("love");
diff --git a/tests/auto/widgets/util.h b/tests/auto/widgets/util.h
index af0b9bf6f..e030d1a2f 100644
--- a/tests/auto/widgets/util.h
+++ b/tests/auto/widgets/util.h
@@ -189,7 +189,7 @@ static inline bool loadSync(QWebEngineView *view, const QUrl &url, bool ok = tru
 #define W_QTEST_MAIN(TestObject, params) \
 int main(int argc, char *argv[]) \
 { \
-    QVector<const char *> w_argv(argc); \
+    QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
         w_argv[i] = argv[i]; \
     for (int i = 0; i < params.size(); ++i) \
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index 6d65eecb5..947587f5e 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -14,7 +14,7 @@ SUBDIRS += \
     proxypac \
     schemes \
     shutdown \
-    qwebenginedownloaditem \
+    qwebenginedownloadrequest \
     qwebenginepage \
     qwebenginehistory \
     qwebengineprofile \
@@ -48,4 +48,4 @@ boot2qt: SUBDIRS -= accessibility defaultsurfaceformat devtools \
                     qwebengineprofile  \
                     qwebengineview
 
-win32: SUBDIRS -= offscreen
+darwin|win32: SUBDIRS -= offscreen