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>

9 files changed, 41 insertions, 38 deletions

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 {