Rename WebEngineLoadRequest to WebEngineLoadingInfo

Rename it, since it's not a real request (in a sense that there is
nothing to accept or reject), and it is also emitted on loading start
and failure.

[ChangeLog][QWebEngineQuick] WebEngineLoadRequest is renamed to
WebEngineLoadingInfo

Change-Id: I75b25da456eb4507451014070525a6a8e9d6753d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

17 files changed, 119 insertions, 118 deletions

diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
index f320cc803..660473600 100644
--- a/src/core/api/CMakeLists.txt
+++ b/src/core/api/CMakeLists.txt
@@ -24,7 +24,7 @@ qt_internal_add_module(WebEngineCore
         qwebenginefullscreenrequest.cpp qwebenginefullscreenrequest.h
         qwebenginehistory.cpp qwebenginehistory.h qwebenginehistory_p.h
         qwebenginehttprequest.cpp qwebenginehttprequest.h
-        qwebengineloadrequest.cpp qwebengineloadrequest.h
+        qwebengineloadinginfo.cpp qwebengineloadinginfo.h
         qwebenginemessagepumpscheduler.cpp qwebenginemessagepumpscheduler_p.h
         qwebenginenavigationrequest.cpp qwebenginenavigationrequest.h
         qwebenginenewwindowrequest.cpp qwebenginenewwindowrequest.h
diff --git a/src/core/api/qwebengineloadrequest.cpp b/src/core/api/qwebengineloadinginfo.cpp
index f260e8252..fcbb2ce7a 100644
--- a/src/core/api/qwebengineloadrequest.cpp
+++ b/src/core/api/qwebengineloadinginfo.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include <qwebengineloadrequest.h>
+#include <qwebengineloadinginfo.h>
 
 #include <web_engine_error.h>
 
 QT_BEGIN_NAMESPACE
 
-using LoadStatus = QWebEngineLoadRequest::LoadStatus;
-using ErrorDomain = QWebEngineLoadRequest::ErrorDomain;
+using LoadStatus = QWebEngineLoadingInfo::LoadStatus;
+using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain;
 
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<int>(ErrorDomain::NoErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::InternalErrorDomain) == static_cast<int>(ErrorDomain::InternalErrorDomain));
@@ -54,9 +54,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::HttpErrorDomain) == static_cast
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::FtpErrorDomain) == static_cast<int>(ErrorDomain::FtpErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(ErrorDomain::DnsErrorDomain));
 
-class QWebEngineLoadRequest::QWebEngineLoadRequestPrivate : public QSharedData {
+class QWebEngineLoadingInfo::QWebEngineLoadingInfoPrivate : public QSharedData {
 public:
-    QWebEngineLoadRequestPrivate(const QUrl& url, LoadStatus status, const QString& errorString, int errorCode, ErrorDomain errorDomain)
+    QWebEngineLoadingInfoPrivate(const QUrl& url, LoadStatus status, const QString& errorString, int errorCode, ErrorDomain errorDomain)
         : url(url)
         , status(status)
         , errorString(errorString)
@@ -73,7 +73,7 @@ public:
 };
 
 /*!
-    \class QWebEngineLoadRequest
+    \class QWebEngineLoadingInfo
     \brief A utility type for the WebEngineView::loadingChanged signal.
     \inmodule QtWebEngineCore
     \since 6.2
@@ -83,34 +83,34 @@ public:
 
     \sa QWebEnginePage::loadStarted, QWebEnginePage::loadFinished, WebEngineView::loadingChanged
 */
-QWebEngineLoadRequest::QWebEngineLoadRequest(const QUrl& url, LoadStatus status, const QString& errorString,
+QWebEngineLoadingInfo::QWebEngineLoadingInfo(const QUrl& url, LoadStatus status, const QString& errorString,
                                            int errorCode, ErrorDomain errorDomain)
-    : d_ptr(new QWebEngineLoadRequestPrivate(url, status, errorString, errorCode, errorDomain))
+    : d_ptr(new QWebEngineLoadingInfoPrivate(url, status, errorString, errorCode, errorDomain))
 {
 }
 
-QWebEngineLoadRequest::QWebEngineLoadRequest(const QWebEngineLoadRequest &other) = default;
-QWebEngineLoadRequest& QWebEngineLoadRequest::operator=(const QWebEngineLoadRequest &other) = default;
-QWebEngineLoadRequest::QWebEngineLoadRequest(QWebEngineLoadRequest &&other) = default;
-QWebEngineLoadRequest& QWebEngineLoadRequest::operator=(QWebEngineLoadRequest &&other) = default;
+QWebEngineLoadingInfo::QWebEngineLoadingInfo(const QWebEngineLoadingInfo &other) = default;
+QWebEngineLoadingInfo& QWebEngineLoadingInfo::operator=(const QWebEngineLoadingInfo &other) = default;
+QWebEngineLoadingInfo::QWebEngineLoadingInfo(QWebEngineLoadingInfo &&other) = default;
+QWebEngineLoadingInfo& QWebEngineLoadingInfo::operator=(QWebEngineLoadingInfo &&other) = default;
 
-QWebEngineLoadRequest::~QWebEngineLoadRequest()
+QWebEngineLoadingInfo::~QWebEngineLoadingInfo()
 {
 }
 /*!
-    \property QWebEngineLoadRequest::url
+    \property QWebEngineLoadingInfo::url
     \brief Holds the URL of the load request.
 */
 /*!
     Returns the URL of the load request.
 */
-QUrl QWebEngineLoadRequest::url() const
+QUrl QWebEngineLoadingInfo::url() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->url;
 }
 /*!
-    \enum QWebEngineLoadRequest::status
+    \enum QWebEngineLoadingInfo::status
 
     This enumeration represents the load status of a web page load request:
 
@@ -127,25 +127,25 @@ QUrl QWebEngineLoadRequest::url() const
 /*!
     Returns the page's load status.
 */
-LoadStatus QWebEngineLoadRequest::status() const
+LoadStatus QWebEngineLoadingInfo::status() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->status;
 }
 /*!
-    \property QWebEngineLoadRequest::errorString
+    \property QWebEngineLoadingInfo::errorString
     \brief Holds the error message.
 */
 /*
     Returns the error message.
 */
-QString QWebEngineLoadRequest::errorString() const
+QString QWebEngineLoadingInfo::errorString() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->errorString;
 }
 /*!
-    \enum enumeration QWebEngineLoadRequest::errorDomain
+    \enum enumeration QWebEngineLoadingInfo::errorDomain
     This enumeration holds the type of a load error:
 
     \value  NoErrorDomain
@@ -164,28 +164,28 @@ QString QWebEngineLoadRequest::errorString() const
             Error is related to the DNS connection.
 */
 /*
-    \property QWebEngineLoadRequest::errorDomain
+    \property QWebEngineLoadingInfo::errorDomain
     \brief Holds the error domain
 */
 /*
     Returns the error domain.
 */
-ErrorDomain QWebEngineLoadRequest::errorDomain() const
+ErrorDomain QWebEngineLoadingInfo::errorDomain() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->errorDomain;
 }
 
 /*!
-    \property int QWebEngineLoadRequest::errorCode
+    \property int QWebEngineLoadingInfo::errorCode
     \brief Holds the error code.
 */
 /*
     Returns the error code.
 */
-int QWebEngineLoadRequest::errorCode() const
+int QWebEngineLoadingInfo::errorCode() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->errorCode;
 }
 
diff --git a/src/core/api/qwebengineloadrequest.h b/src/core/api/qwebengineloadinginfo.h
index 6520d8982..bd07d52a3 100644
--- a/src/core/api/qwebengineloadrequest.h
+++ b/src/core/api/qwebengineloadinginfo.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINELOADREQUEST_H
-#define QWEBENGINELOADREQUEST_H
+#ifndef QWEBENGINELOADINGINFO_H
+#define QWEBENGINELOADINGINFO_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
@@ -47,8 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-
-class Q_WEBENGINECORE_EXPORT QWebEngineLoadRequest
+class Q_WEBENGINECORE_EXPORT QWebEngineLoadingInfo
 {
     Q_GADGET
     Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
@@ -77,11 +76,11 @@ public:
     };
     Q_ENUM(ErrorDomain)
 
-    QWebEngineLoadRequest(const QWebEngineLoadRequest &other);
-    QWebEngineLoadRequest &operator=(const QWebEngineLoadRequest &other);
-    QWebEngineLoadRequest(QWebEngineLoadRequest &&other);
-    QWebEngineLoadRequest &operator=(QWebEngineLoadRequest &&other);
-    ~QWebEngineLoadRequest();
+    QWebEngineLoadingInfo(const QWebEngineLoadingInfo &other);
+    QWebEngineLoadingInfo &operator=(const QWebEngineLoadingInfo &other);
+    QWebEngineLoadingInfo(QWebEngineLoadingInfo &&other);
+    QWebEngineLoadingInfo &operator=(QWebEngineLoadingInfo &&other);
+    ~QWebEngineLoadingInfo();
 
     QUrl url() const;
     LoadStatus status() const;
@@ -90,15 +89,15 @@ public:
     int errorCode() const;
 
 private:
-    QWebEngineLoadRequest(const QUrl& url, LoadStatus status, const QString& errorString = QString(),
-                          int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
-    class QWebEngineLoadRequestPrivate;
-    Q_DECLARE_PRIVATE(QWebEngineLoadRequest)
-    QExplicitlySharedDataPointer<QWebEngineLoadRequestPrivate> d_ptr;
+    QWebEngineLoadingInfo(const QUrl& url, LoadStatus status, const QString& errorString = QString(),
+                       int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
+    class QWebEngineLoadingInfoPrivate;
+    Q_DECLARE_PRIVATE(QWebEngineLoadingInfo)
+    QExplicitlySharedDataPointer<QWebEngineLoadingInfoPrivate> d_ptr;
     friend class QQuickWebEngineViewPrivate;
     friend class QQuickWebEngineErrorPage;
 };
 
 QT_END_NAMESPACE
 
-#endif // QWEBENGINELOADREQUEST_H
+#endif // QWEBENGINELOADINGINFO_H
diff --git a/src/webenginequick/api/qquickwebenginetestsupport.cpp b/src/webenginequick/api/qquickwebenginetestsupport.cpp
index 06798fe99..d15472291 100644
--- a/src/webenginequick/api/qquickwebenginetestsupport.cpp
+++ b/src/webenginequick/api/qquickwebenginetestsupport.cpp
@@ -39,7 +39,7 @@
 
 #include "qquickwebenginetestsupport_p.h"
 
-#include "qwebengineloadrequest.h"
+#include "qwebengineloadinginfo.h"
 
 #include <QQuickItem>
 #include <QQuickWindow>
@@ -60,14 +60,14 @@ void QQuickWebEngineErrorPage::loadFinished(bool success, const QUrl &url)
 {
     Q_UNUSED(success);
     QTimer::singleShot(0, this, [this, url]() {
-       emit loadingChanged(QWebEngineLoadRequest(url, QWebEngineLoadRequest::LoadSucceededStatus));
+       emit loadingChanged(QWebEngineLoadingInfo(url, QWebEngineLoadingInfo::LoadSucceededStatus));
     });
 }
 
 void QQuickWebEngineErrorPage::loadStarted(const QUrl &provisionalUrl)
 {
     QTimer::singleShot(0, this, [this, provisionalUrl]() {
-        emit loadingChanged(QWebEngineLoadRequest(provisionalUrl, QWebEngineLoadRequest::LoadStartedStatus));
+        emit loadingChanged(QWebEngineLoadingInfo(provisionalUrl, QWebEngineLoadingInfo::LoadStartedStatus));
     });
 }
 
diff --git a/src/webenginequick/api/qquickwebenginetestsupport_p.h b/src/webenginequick/api/qquickwebenginetestsupport_p.h
index 189643a87..0accb9b67 100644
--- a/src/webenginequick/api/qquickwebenginetestsupport_p.h
+++ b/src/webenginequick/api/qquickwebenginetestsupport_p.h
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWebEngineLoadRequest;
+class QWebEngineLoadingInfo;
 class QWindow;
 
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineErrorPage : public QObject {
@@ -73,7 +73,7 @@ public:
     void loadStarted(const QUrl &provisionalUrl);
 
 Q_SIGNALS:
-    void loadingChanged(const QWebEngineLoadRequest &loadRequest);
+    void loadingChanged(const QWebEngineLoadingInfo &loadStatus);
 };
 
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineTestInputContext : public QPlatformInputContext {
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index b80bead98..f457bb338 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -57,7 +57,7 @@
 #include "qwebenginecertificateerror.h"
 #include "qwebenginefindtextresult.h"
 #include "qwebenginefullscreenrequest.h"
-#include "qwebengineloadrequest.h"
+#include "qwebengineloadinginfo.h"
 #include "qwebenginenavigationrequest.h"
 #include "qwebenginenewwindowrequest.h"
 #include "qwebenginequotarequest.h"
@@ -99,8 +99,8 @@
 QT_BEGIN_NAMESPACE
 using namespace QtWebEngineCore;
 
-using LoadStatus = QWebEngineLoadRequest::LoadStatus;
-using ErrorDomain = QWebEngineLoadRequest::ErrorDomain;
+using LoadStatus = QWebEngineLoadingInfo::LoadStatus;
+using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain;
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NoErrorDomain)          == static_cast<int>(ErrorDomain::NoErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::InternalErrorDomain)    == static_cast<int>(ErrorDomain::InternalErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::ConnectionErrorDomain)  == static_cast<int>(ErrorDomain::ConnectionErrorDomain));
@@ -470,7 +470,7 @@ void QQuickWebEngineViewPrivate::loadStarted(const QUrl &provisionalUrl, bool is
     m_history->reset();
 
     QTimer::singleShot(0, q, [q, provisionalUrl]() {
-        emit q->loadingChanged(QWebEngineLoadRequest(provisionalUrl, LoadStatus::LoadStartedStatus));
+        emit q->loadingChanged(QWebEngineLoadingInfo(provisionalUrl, LoadStatus::LoadStartedStatus));
     });
 }
 
@@ -521,13 +521,13 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, boo
     m_history->reset();
     if (errorCode == WebEngineError::UserAbortedError) {
         QTimer::singleShot(0, q, [q, url]() {
-            emit q->loadingChanged(QWebEngineLoadRequest(url, LoadStatus::LoadStoppedStatus));
+            emit q->loadingChanged(QWebEngineLoadingInfo(url, LoadStatus::LoadStoppedStatus));
         });
         return;
     }
     if (success) {
         QTimer::singleShot(0, q, [q, url, errorDescription, errorCode]() {
-            emit q->loadingChanged(QWebEngineLoadRequest(url, LoadStatus::LoadSucceededStatus, errorDescription, errorCode));
+            emit q->loadingChanged(QWebEngineLoadingInfo(url, LoadStatus::LoadSucceededStatus, errorDescription, errorCode));
         });
         return;
     }
@@ -535,7 +535,7 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, boo
     Q_ASSERT(errorCode);
     auto errorDomain = static_cast<ErrorDomain>(WebEngineError::toQtErrorDomain(errorCode));
     QTimer::singleShot(0, q, [q, url, errorDescription, errorCode, errorDomain]() {
-        emit q->loadingChanged(QWebEngineLoadRequest(url, LoadStatus::LoadFailedStatus, errorDescription, errorCode, errorDomain));
+        emit q->loadingChanged(QWebEngineLoadingInfo(url, LoadStatus::LoadFailedStatus, errorDescription, errorCode, errorDomain));
     });
     return;
 }
@@ -943,7 +943,7 @@ void QQuickWebEngineViewPrivate::initializationFinished()
     emit q->titleChanged();
     emit q->urlChanged();
     emit q->iconChanged();
-    emit q->loadingChanged(QWebEngineLoadRequest(m_url, LoadStatus::LoadSucceededStatus));
+    emit q->loadingChanged(QWebEngineLoadingInfo(m_url, LoadStatus::LoadSucceededStatus));
     emit q->loadProgressChanged();
 
     m_isBeingAdopted = false;
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index bf8b0d5e0..0ec0e91e1 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -81,7 +81,7 @@ class QWebEngineContextMenuRequest;
 class QWebEngineFindTextResult;
 class QWebEngineFullScreenRequest;
 class QWebEngineHistory;
-class QWebEngineLoadRequest;
+class QWebEngineLoadingInfo;
 class QWebEngineNavigationRequest;
 class QWebEngineNewWindowRequest;
 class QWebEngineQuotaRequest;
@@ -499,7 +499,7 @@ Q_SIGNALS:
     void titleChanged();
     void urlChanged();
     void iconChanged();
-    void loadingChanged(const QWebEngineLoadRequest &loadRequest);
+    void loadingChanged(const QWebEngineLoadingInfo &loadingInfo);
     void loadProgressChanged();
     void linkHovered(const QUrl &hoveredUrl);
     void navigationRequested(QWebEngineNavigationRequest *request);
diff --git a/src/webenginequick/doc/src/load_request.qdoc b/src/webenginequick/doc/src/loading_info.qdoc
index abe3a403f..9666b2020 100644
--- a/src/webenginequick/doc/src/load_request.qdoc
+++ b/src/webenginequick/doc/src/loading_info.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \qmltype WebEngineLoadRequest
-    \instantiates QWebEngineLoadRequest
+    \qmltype WebEngineLoadingInfo
+    \instantiates QWebEngineLoadingInfo
     \inqmlmodule QtWebEngine
     \since QtWebEngine 1.0
 
@@ -39,11 +39,11 @@
     \sa WebEngineView::loadingChanged
 */
 /*!
-    \qmlproperty url WebEngineLoadRequest::url
+    \qmlproperty url WebEngineLoadingInfo::url
     \brief Holds the URL of the load request.
  */
 /*!
-    \qmlproperty enumeration WebEngineLoadRequest::status
+    \qmlproperty enumeration WebEngineLoadingInfo::status
 
     This enumeration represents the load status of a web page load request:
 
@@ -58,29 +58,32 @@
     \sa WebEngineView::loadingChanged
 */
 /*!
-    \qmlproperty string WebEngineLoadRequest::errorString
+    \qmlproperty Indicates if the load's resulted in an error page.
+*/
+/*!
+    \qmlproperty string WebEngineLoadingInfo::errorString
     \brief Holds the error message.
 */
 /*!
-    \qmlproperty enumeration WebEngineLoadRequest::errorDomain
+    \qmlproperty enumeration WebEngineLoadingInfo::errorDomain
     This enumeration holds the type of a load request error:
 
-    \value  WebEngineLoadRequest.NoErrorDomain
+    \value  WebEngineLoadingInfo.NoErrorDomain
             Error type is not known.
-    \value  WebEngineLoadRequest.InternalErrorDomain
+    \value  WebEngineLoadingInfo.InternalErrorDomain
             Content cannot be interpreted by \QWE.
-    \value  WebEngineLoadRequest.ConnectionErrorDomain
+    \value  WebEngineLoadingInfo.ConnectionErrorDomain
             Error results from a faulty network connection.
-    \value  WebEngineLoadRequest.CertificateErrorDomain
+    \value  WebEngineLoadingInfo.CertificateErrorDomain
             Error is related to the SSL/TLS certificate.
-    \value  WebEngineLoadRequest.HttpErrorDomain
+    \value  WebEngineLoadingInfo.HttpErrorDomain
             Error is related to the HTTP connection.
-    \value  WebEngineLoadRequest.FtpErrorDomain
+    \value  WebEngineLoadingInfo.FtpErrorDomain
             Error is related to the FTP connection.
-    \value  WebEngineLoadRequest.DnsErrorDomain
+    \value  WebEngineLoadingInfo.DnsErrorDomain
             Error is related to the DNS connection.
 */
 /*!
-    \qmlproperty int WebEngineLoadRequest::errorCode
+    \qmlproperty int WebEngineLoadingInfo::errorCode
     \brief Holds the error code.
 */
diff --git a/src/webenginequick/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
index 29a71f979..498088a4a 100644
--- a/src/webenginequick/doc/src/webengineview_lgpl.qdoc
+++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
@@ -525,13 +525,13 @@
 */
 
 /*!
-    \qmlsignal WebEngineView::loadingChanged(WebEngineLoadRequest loadRequest)
+    \qmlsignal WebEngineView::loadingChanged(WebEngineLoadingInfo loadingInfo)
 
     This signal is emitted when a page load begins, ends, or fails.
 
     When handling the signal with \c onLoadingChanged, various read-only
-    parameters are available on the WebEngineLoadRequest specified by
-    \a loadRequest.
+    parameters are available on the WebEngineLoadingInfo specified by
+    \a loadingInfo.
 
     \sa loading, LoadStatus, ErrorDomain
 */
diff --git a/src/webenginequick/plugin/plugin.cpp b/src/webenginequick/plugin/plugin.cpp
index c044a08be..a76ffbb48 100644
--- a/src/webenginequick/plugin/plugin.cpp
+++ b/src/webenginequick/plugin/plugin.cpp
@@ -52,7 +52,7 @@
 #include <QtWebEngineCore/qwebenginefindtextresult.h>
 #include <QtWebEngineCore/qwebenginefullscreenrequest.h>
 #include <QtWebEngineCore/qwebenginehistory.h>
-#include <QtWebEngineCore/qwebengineloadrequest.h>
+#include <QtWebEngineCore/qwebengineloadinginfo.h>
 #include <QtWebEngineCore/qwebenginenavigationrequest.h>
 #include <QtWebEngineCore/qwebenginenewwindowrequest.h>
 #include <QtWebEngineCore/qwebenginenotification.h>
@@ -86,7 +86,7 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine"));
 
         qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebEngineView");
-        qmlRegisterUncreatableType<QWebEngineLoadRequest>(uri, 1, 0, "WebEngineLoadRequest", msgUncreatableType("WebEngineLoadRequest"));
+        qmlRegisterUncreatableType<QWebEngineLoadingInfo>(uri, 1, 0, "WebEngineLoadingInfo", msgUncreatableType("WebEngineLoadingInfo"));
         qmlRegisterUncreatableType<QWebEngineNavigationRequest>(uri, 1, 0, "WebEngineNavigationRequest", msgUncreatableType("WebEngineNavigationRequest"));
 
         qmlRegisterType<QQuickWebEngineView, 1>(uri, 1, 1, "WebEngineView");
diff --git a/src/webenginequick/plugin/plugins.qmltypes b/src/webenginequick/plugin/plugins.qmltypes
index 541976d34..18026f91a 100644
--- a/src/webenginequick/plugin/plugins.qmltypes
+++ b/src/webenginequick/plugin/plugins.qmltypes
@@ -702,9 +702,9 @@ Module {
         Method { name: "dialogReject" }
     }
     Component {
-        name: "QWebEngineLoadRequest"
+        name: "QWebEngineLoadingInfo"
         prototype: "QObject"
-        exports: ["QtWebEngine/WebEngineLoadRequest 1.0"]
+        exports: ["QtWebEngine/WebEngineLoadingInfo 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "url"; type: "QUrl"; isReadonly: true }
@@ -1350,7 +1350,7 @@ Module {
         Property { name: "renderProcessId"; revision: 11; type: "qint64"; isReadonly: true }
         Signal {
             name: "loadingChanged"
-            Parameter { name: "loadRequest"; type: "QWebEngineLoadRequest" }
+            Parameter { name: "loadingInfo"; type: "QWebEngineLoadingInfo" }
         }
         Signal {
             name: "linkHovered"
diff --git a/src/webenginequick/testsupport/plugins.qmltypes b/src/webenginequick/testsupport/plugins.qmltypes
index d371e1af6..17fb56658 100644
--- a/src/webenginequick/testsupport/plugins.qmltypes
+++ b/src/webenginequick/testsupport/plugins.qmltypes
@@ -17,7 +17,7 @@ Module {
         exportMetaObjectRevisions: [0]
         Signal {
             name: "loadingChanged"
-            Parameter { name: "loadRequest"; type: "QWebEngineLoadRequest"; isPointer: true }
+            Parameter { name: "loadingInfo"; type: "QWebEngineLoadingInfo" }
         }
     }
     Component {
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index de49f143c..ef8e74a31 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -119,7 +119,7 @@ void tst_InspectorServer::testPageList()
 {
     const QUrl testPageUrl = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
                                                  + QLatin1String("/html/basic_page.html"));
-    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
+    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webView()->setUrl(testPageUrl);
     QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
 
@@ -133,7 +133,7 @@ void tst_InspectorServer::testRemoteDebuggingMessage()
 {
     const QUrl testPageUrl = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
                                                  + QLatin1String("/html/basic_page.html"));
-    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
+    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webView()->setUrl(testPageUrl);
     QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
 
@@ -168,7 +168,7 @@ void tst_InspectorServer::openRemoteDebuggingSession()
 {
     const QUrl testPageUrl = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath()
                                                  + QLatin1String("/html/basic_page.html"));
-    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
+    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webView()->setUrl(testPageUrl);
     QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
 
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 773ab12d1..8f8227b44 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -46,7 +46,7 @@
 #include <QtWebEngineCore/QWebEngineContextMenuRequest>
 #include <QtWebEngineCore/QWebEngineDownloadRequest>
 #include <QtWebEngineCore/QWebEngineScript>
-#include <QtWebEngineCore/QWebEngineLoadRequest>
+#include <QtWebEngineCore/QWebEngineLoadingInfo>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebengineaction_p.h>
 #include <private/qquickwebengineclientcertificateselection_p.h>
@@ -82,7 +82,7 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *
     << &QWebEngineContextMenuRequest::staticMetaObject
     << &QWebEngineCertificateError::staticMetaObject
     << &QWebEngineFindTextResult::staticMetaObject
-    << &QWebEngineLoadRequest::staticMetaObject
+    << &QWebEngineLoadingInfo::staticMetaObject
     << &QWebEngineNavigationRequest::staticMetaObject
     << &QWebEngineNewWindowRequest::staticMetaObject
     << &QWebEngineNotification::staticMetaObject
@@ -311,22 +311,22 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineJavaScriptDialogRequest.securityOrigin --> QUrl"
     << "QQuickWebEngineJavaScriptDialogRequest.title --> QString"
     << "QQuickWebEngineJavaScriptDialogRequest.type --> QQuickWebEngineJavaScriptDialogRequest::DialogType"
-    << "QWebEngineLoadRequest.errorCode --> int"
-    << "QWebEngineLoadRequest.errorDomain --> QWebEngineLoadRequest::ErrorDomain"
-    << "QWebEngineLoadRequest.errorString --> QString"
-    << "QWebEngineLoadRequest.status --> QWebEngineLoadRequest::LoadStatus"
-    << "QWebEngineLoadRequest.url --> QUrl"
-    << "QWebEngineLoadRequest.LoadFailedStatus --> LoadStatus"
-    << "QWebEngineLoadRequest.LoadStartedStatus --> LoadStatus"
-    << "QWebEngineLoadRequest.LoadStoppedStatus --> LoadStatus"
-    << "QWebEngineLoadRequest.LoadSucceededStatus --> LoadStatus"
-    << "QWebEngineLoadRequest.CertificateErrorDomain --> ErrorDomain"
-    << "QWebEngineLoadRequest.ConnectionErrorDomain --> ErrorDomain"
-    << "QWebEngineLoadRequest.DnsErrorDomain --> ErrorDomain"
-    << "QWebEngineLoadRequest.FtpErrorDomain --> ErrorDomain"
-    << "QWebEngineLoadRequest.HttpErrorDomain --> ErrorDomain"
-    << "QWebEngineLoadRequest.InternalErrorDomain --> ErrorDomain"
-    << "QWebEngineLoadRequest.NoErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.errorCode --> int"
+    << "QWebEngineLoadingInfo.errorDomain --> QWebEngineLoadingInfo::ErrorDomain"
+    << "QWebEngineLoadingInfo.errorString --> QString"
+    << "QWebEngineLoadingInfo.status --> QWebEngineLoadingInfo::LoadStatus"
+    << "QWebEngineLoadingInfo.url --> QUrl"
+    << "QWebEngineLoadingInfo.LoadFailedStatus --> LoadStatus"
+    << "QWebEngineLoadingInfo.LoadStartedStatus --> LoadStatus"
+    << "QWebEngineLoadingInfo.LoadStoppedStatus --> LoadStatus"
+    << "QWebEngineLoadingInfo.LoadSucceededStatus --> LoadStatus"
+    << "QWebEngineLoadingInfo.CertificateErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.ConnectionErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.DnsErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.FtpErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.HttpErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.InternalErrorDomain --> ErrorDomain"
+    << "QWebEngineLoadingInfo.NoErrorDomain --> ErrorDomain"
     << "QWebEngineNavigationRequest.action --> QWebEngineNavigationRequest::NavigationRequestAction"
     << "QWebEngineNavigationRequest.actionChanged() --> void"
     << "QWebEngineNavigationRequest.isMainFrame --> bool"
@@ -721,7 +721,7 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.loadProgress --> int"
     << "QQuickWebEngineView.loadProgressChanged() --> void"
     << "QQuickWebEngineView.loading --> bool"
-    << "QQuickWebEngineView.loadingChanged(QWebEngineLoadRequest) --> void"
+    << "QQuickWebEngineView.loadingChanged(QWebEngineLoadingInfo) --> void"
     << "QQuickWebEngineView.navigationRequested(QWebEngineNavigationRequest*) --> void"
     << "QQuickWebEngineView.newViewRequested(QWebEngineNewWindowRequest*) --> void"
     << "QQuickWebEngineView.pdfPrintingFinished(QString,bool) --> void"
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
index 4275ae971..99ed8a061 100644
--- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
+++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
@@ -126,10 +126,10 @@ void tst_QQuickWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat()
 
     QObject::connect(
         view,
-        &QQuickWebEngineView::loadingChanged, [](const QWebEngineLoadRequest &request)
+        &QQuickWebEngineView::loadingChanged, [](const QWebEngineLoadingInfo &info)
         {
-            if (request.status() == QWebEngineLoadRequest::LoadSucceededStatus
-               || request.status() == QWebEngineLoadRequest::LoadFailedStatus)
+            if (info.status() == QWebEngineLoadingInfo::LoadSucceededStatus
+               || info.status() == QWebEngineLoadingInfo::LoadFailedStatus)
                 QTimer::singleShot(100, qApp, &QCoreApplication::quit);
         }
     );
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index d0df5ffe0..667b99113 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -198,7 +198,7 @@ void tst_QQuickWebEngineView::loadEmptyPageViewVisible()
 
 void tst_QQuickWebEngineView::loadEmptyPageViewHidden()
 {
-    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
+    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
 
     webEngineView()->setUrl(urlFromTestPath("html/basic_page.html"));
     QVERIFY(waitForLoadSucceeded(webEngineView()));
@@ -208,7 +208,7 @@ void tst_QQuickWebEngineView::loadEmptyPageViewHidden()
 
 void tst_QQuickWebEngineView::loadNonexistentFileUrl()
 {
-    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
+    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
 
     webEngineView()->setUrl(urlFromTestPath("html/file_that_does_not_exist.html"));
     QVERIFY(waitForLoadFailed(webEngineView()));
@@ -1169,7 +1169,7 @@ void tst_QQuickWebEngineView::javascriptClipboard()
 }
 
 void tst_QQuickWebEngineView::setProfile() {
-    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
+    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadingInfo)));
     webEngineView()->setUrl(urlFromTestPath("html/basic_page.html"));
     QVERIFY(waitForLoadSucceeded(webEngineView()));
     QCOMPARE(loadSpy.size(), 2);
diff --git a/tests/auto/util/quickutil.h b/tests/auto/util/quickutil.h
index 34afbbb45..cfaf89df9 100644
--- a/tests/auto/util/quickutil.h
+++ b/tests/auto/util/quickutil.h
@@ -34,8 +34,7 @@
 #include <QSignalSpy>
 #include <QTimer>
 #include <QtTest/QtTest>
-#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
-#include <QtWebEngineCore/QWebEngineLoadRequest>
+#include <QtWebEngineCore/QWebEngineLoadingInfo>
 #include <QtWebEngineQuick/private/qquickwebengineview_p.h>
 #include <QGuiApplication>
 
@@ -59,11 +58,11 @@ Q_SIGNALS:
     void loadFailed();
 
 private Q_SLOTS:
-    void onLoadingChanged(const QWebEngineLoadRequest &request)
+    void onLoadingChanged(const QWebEngineLoadingInfo &info)
     {
-        if (request.status() == QWebEngineLoadRequest::LoadSucceededStatus)
+        if (info.status() == QWebEngineLoadingInfo::LoadSucceededStatus)
             emit loadSucceeded();
-        else if (request.status() == QWebEngineLoadRequest::LoadFailedStatus)
+        else if (info.status() == QWebEngineLoadingInfo::LoadFailedStatus)
             emit loadFailed();
     }
 };
@@ -81,9 +80,9 @@ public:
     virtual ~LoadStartedCatcher() { }
 
 public Q_SLOTS:
-    void onLoadingChanged(const QWebEngineLoadRequest &request)
+    void onLoadingChanged(const QWebEngineLoadingInfo &info)
     {
-        if (request.status() == QWebEngineLoadRequest::LoadStartedStatus)
+        if (info.status() == QWebEngineLoadingInfo::LoadStartedStatus)
             QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
     }