From 7a57358683ee3a04c15d55b6475594aa81febf6f Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 19 Feb 2021 20:38:07 +0100
Subject: 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>
---
 tests/auto/quick/publicapi/tst_publicapi.cpp | 38 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'tests/auto/quick/publicapi')

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"
-- 
cgit v1.2.3