Move QQuickWebEngineLoadRequest to core as a base api type

Prepare it to be used in widgets api for load status change. Turn it into
simple value type which is allowed to be copied, stored and spied upon.

[ChangeLog] Move WebEngineLoadRequest as a basic type into QtWebEngineCore

Task-number: QTBUG-74585
Change-Id: Ie182da02a539a89323b8bbec07f1daa700309e70
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

5 files changed, 36 insertions, 25 deletions

diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 1f30fce5b..a3c118695 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -120,7 +120,7 @@ QJsonArray tst_InspectorServer::fetchPageList() const
 void tst_InspectorServer::testPageList()
 {
     const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html"));
-    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*)));
+    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
     webView()->setUrl(testPageUrl);
     QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
 
@@ -133,7 +133,7 @@ void tst_InspectorServer::testPageList()
 void tst_InspectorServer::testRemoteDebuggingMessage()
 {
     const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html"));
-    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*)));
+    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
     webView()->setUrl(testPageUrl);
     QTRY_VERIFY(loadSpy.size() && !webView()->isLoading());
 
@@ -167,7 +167,7 @@ void tst_InspectorServer::testRemoteDebuggingMessage()
 void tst_InspectorServer::openRemoteDebuggingSession()
 {
     const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html"));
-    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*)));
+    QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
     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 e79ed86de..ba76ad757 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -43,12 +43,12 @@
 #include <QtWebEngineCore/QWebEngineContextMenuRequest>
 #include <QtWebEngineCore/QWebEngineDownloadRequest>
 #include <QtWebEngineCore/QWebEngineScript>
+#include <QtWebEngineCore/QWebEngineLoadRequest>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebengineaction_p.h>
 #include <private/qquickwebengineclientcertificateselection_p.h>
 #include <private/qquickwebenginedialogrequests_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>
@@ -68,7 +68,7 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *
     << &QWebEngineDownloadRequest::staticMetaObject
     << &QQuickWebEngineHistory::staticMetaObject
     << &QQuickWebEngineHistoryListModel::staticMetaObject
-    << &QQuickWebEngineLoadRequest::staticMetaObject
+    << &QWebEngineLoadRequest::staticMetaObject
     << &QQuickWebEngineNavigationRequest::staticMetaObject
     << &QQuickWebEngineNewViewRequest::staticMetaObject
     << &QQuickWebEngineProfile::staticMetaObject
@@ -311,11 +311,22 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineJavaScriptDialogRequest.securityOrigin --> QUrl"
     << "QQuickWebEngineJavaScriptDialogRequest.title --> QString"
     << "QQuickWebEngineJavaScriptDialogRequest.type --> DialogType"
-    << "QQuickWebEngineLoadRequest.errorCode --> int"
-    << "QQuickWebEngineLoadRequest.errorDomain --> QQuickWebEngineView::ErrorDomain"
-    << "QQuickWebEngineLoadRequest.errorString --> QString"
-    << "QQuickWebEngineLoadRequest.status --> QQuickWebEngineView::LoadStatus"
-    << "QQuickWebEngineLoadRequest.url --> QUrl"
+    << "QWebEngineLoadRequest.errorCode --> int"
+    << "QWebEngineLoadRequest.errorDomain --> ErrorDomain"
+    << "QWebEngineLoadRequest.errorString --> QString"
+    << "QWebEngineLoadRequest.status --> 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"
     << "QQuickWebEngineNavigationRequest.action --> QQuickWebEngineView::NavigationRequestAction"
     << "QQuickWebEngineNavigationRequest.actionChanged() --> void"
     << "QQuickWebEngineNavigationRequest.isMainFrame --> bool"
@@ -707,7 +718,7 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.loadProgress --> int"
     << "QQuickWebEngineView.loadProgressChanged() --> void"
     << "QQuickWebEngineView.loading --> bool"
-    << "QQuickWebEngineView.loadingChanged(QQuickWebEngineLoadRequest*) --> void"
+    << "QQuickWebEngineView.loadingChanged(QWebEngineLoadRequest) --> void"
     << "QQuickWebEngineView.navigationHistory --> QQuickWebEngineHistory*"
     << "QQuickWebEngineView.navigationRequested(QQuickWebEngineNavigationRequest*) --> void"
     << "QQuickWebEngineView.newViewRequested(QQuickWebEngineNewViewRequest*) --> void"
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
index 734c4ff7a..016e8232f 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, [](QQuickWebEngineLoadRequest* request)
+        &QQuickWebEngineView::loadingChanged, [](const QWebEngineLoadRequest &request)
         {
-            if (request->status() == QQuickWebEngineView::LoadSucceededStatus
-               || request->status() == QQuickWebEngineView::LoadFailedStatus)
+            if (request.status() == QWebEngineLoadRequest::LoadSucceededStatus
+               || request.status() == QWebEngineLoadRequest::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 01fabaf5a..005dd2dd3 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(QQuickWebEngineLoadRequest*)));
+    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
 
     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(QQuickWebEngineLoadRequest*)));
+    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
 
     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(QQuickWebEngineLoadRequest*)));
+    QSignalSpy loadSpy(webEngineView(), SIGNAL(loadingChanged(QWebEngineLoadRequest)));
     webEngineView()->setUrl(urlFromTestPath("html/basic_page.html"));
     QVERIFY(waitForLoadSucceeded(webEngineView()));
     QCOMPARE(loadSpy.size(), 2);
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h
index 132c353ca..910522b32 100644
--- a/tests/auto/quick/shared/util.h
+++ b/tests/auto/quick/shared/util.h
@@ -35,7 +35,7 @@
 #include <QTimer>
 #include <QtTest/QtTest>
 #include <QtWebEngine/private/qquickwebengineview_p.h>
-#include <QtWebEngine/private/qquickwebengineloadrequest_p.h>
+#include <QtWebEngineCore/QWebEngineLoadRequest>
 #include <QGuiApplication>
 
 #if !defined(TESTS_SOURCE_DIR)
@@ -48,7 +48,7 @@ class LoadSpy : public QEventLoop {
 public:
     LoadSpy(QQuickWebEngineView *webEngineView)
     {
-        connect(webEngineView, SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*)), SLOT(onLoadingChanged(QQuickWebEngineLoadRequest*)));
+        connect(webEngineView, &QQuickWebEngineView::loadingChanged, this, &LoadSpy::onLoadingChanged);
     }
 
     ~LoadSpy() { }
@@ -58,11 +58,11 @@ Q_SIGNALS:
     void loadFailed();
 
 private Q_SLOTS:
-    void onLoadingChanged(QQuickWebEngineLoadRequest *loadRequest)
+    void onLoadingChanged(const QWebEngineLoadRequest &request)
     {
-        if (loadRequest->status() == QQuickWebEngineView::LoadSucceededStatus)
+        if (request.status() == QWebEngineLoadRequest::LoadSucceededStatus)
             emit loadSucceeded();
-        else if (loadRequest->status() == QQuickWebEngineView::LoadFailedStatus)
+        else if (request.status() == QWebEngineLoadRequest::LoadFailedStatus)
             emit loadFailed();
     }
 };
@@ -74,15 +74,15 @@ public:
     LoadStartedCatcher(QQuickWebEngineView *webEngineView)
         : m_webEngineView(webEngineView)
     {
-        connect(m_webEngineView, SIGNAL(loadingChanged(QQuickWebEngineLoadRequest*)), this, SLOT(onLoadingChanged(QQuickWebEngineLoadRequest*)));
+        connect(m_webEngineView, &QQuickWebEngineView::loadingChanged, this, &LoadStartedCatcher::onLoadingChanged);
     }
 
     virtual ~LoadStartedCatcher() { }
 
 public Q_SLOTS:
-    void onLoadingChanged(QQuickWebEngineLoadRequest *loadRequest)
+    void onLoadingChanged(const QWebEngineLoadRequest &request)
     {
-        if (loadRequest->status() == QQuickWebEngineView::LoadStartedStatus)
+        if (request.status() == QWebEngineLoadRequest::LoadStartedStatus)
             QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
     }