Make QWebViewLoadRequest a public class

Move LoadStatus enum from QWebView class to QWebLoadRequest class. Small adjustments to fix compile issues. Task-number: QTBUG-131837 Change-Id: I79b6a48b0426b177133502f75fb34af9d2120e46 Reviewed-by: Moss Heim <moss.heim@qt.io>
author: Kaloyan Chehlarski <kaloyan.chehlarski@qt.io> 2025-11-25 12:58:37 +0100
committer: Michal Klocek <michal.klocek@qt.io> 2025-12-01 16:02:53 +0100
commit: 3aa448809c7e3f9631d30d9bbfc62c7933bc93f5 (patch)
tree: 8f593153c03becdf22b2f90c39e7b2c781ed1d79
parent: 7721af5cb47fd2656124ffa9fe08faea44835463 (diff)
14 files changed, 115 insertions, 107 deletions
diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp
index cf3fb27..612d602 100644
--- a/src/plugins/android/qandroidwebview.cpp
+++ b/src/plugins/android/qandroidwebview.cpp
@@ -302,9 +302,9 @@ static void c_onPageFinished(JNIEnv *env,
     if (!g_webViews->contains(wc))
         return;
 
-    QWebViewLoadRequestPrivate loadRequest(QUrl(QJniObject(url).toString()),
-                                           QWebView::LoadSucceededStatus,
-                                           QString());
+    QWebViewLoadRequest loadRequest(QUrl(QJniObject(url).toString()),
+                                    QWebViewLoadRequest::LoadStatus::LoadSucceededStatus,
+                                    QString());
     emit wc->q_ptr->loadingChanged(loadRequest);
 }
 Q_DECLARE_JNI_NATIVE_METHOD(c_onPageFinished)
@@ -324,9 +324,8 @@ static void c_onPageStarted(JNIEnv *env,
     if (!g_webViews->contains(wc))
         return;
 
-    QWebViewLoadRequestPrivate loadRequest(QUrl(QJniObject(url).toString()),
-                                           QWebView::LoadStartedStatus,
-                                           QString());
+    QWebViewLoadRequest loadRequest(QUrl(QJniObject(url).toString()),
+                                    QWebViewLoadRequest::LoadStatus::LoadStartedStatus, QString());
     emit wc->q_ptr->loadingChanged(loadRequest);
 
 //    if (!icon)
@@ -411,9 +410,9 @@ static void c_onReceivedError(JNIEnv *env,
     if (!g_webViews->contains(wc))
         return;
 
-    QWebViewLoadRequestPrivate loadRequest(QUrl(QJniObject(url).toString()),
-                                           QWebView::LoadFailedStatus,
-                                           QJniObject(description).toString());
+    QWebViewLoadRequest loadRequest(QUrl(QJniObject(url).toString()),
+                                    QWebViewLoadRequest::LoadStatus::LoadFailedStatus,
+                                    QJniObject(description).toString());
     emit wc->q_ptr->loadingChanged(loadRequest);
 }
 Q_DECLARE_JNI_NATIVE_METHOD(c_onReceivedError)
diff --git a/src/plugins/darwin/qdarwinwebview.mm b/src/plugins/darwin/qdarwinwebview.mm
index 6e2e49a..a74cebc 100644
--- a/src/plugins/darwin/qdarwinwebview.mm
+++ b/src/plugins/darwin/qdarwinwebview.mm
@@ -73,8 +73,9 @@ typedef NSView UIView;
     NSURL *failingURL = error.userInfo[@"NSErrorFailingURLKey"];
     const QUrl url = [failingURL isKindOfClass:[NSURL class]]
                         ? QUrl::fromNSURL(failingURL) : qDarwinWebViewPrivate->url();
-    emit qDarwinWebViewPrivate->q_ptr->loadingChanged(QWebViewLoadRequestPrivate(
-            url, QWebView::LoadFailedStatus, QString::fromNSString(errorString)));
+    emit qDarwinWebViewPrivate->q_ptr->loadingChanged(
+            QWebViewLoadRequest(url, QWebViewLoadRequest::LoadStatus::LoadFailedStatus,
+                                QString::fromNSString(errorString)));
 }
 
 - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
@@ -90,8 +91,9 @@ typedef NSView UIView;
     else
         return;
 
-    emit qDarwinWebViewPrivate->q_ptr->loadingChanged(QWebViewLoadRequestPrivate(
-            qDarwinWebViewPrivate->url(), QWebView::LoadStartedStatus, QString()));
+    emit qDarwinWebViewPrivate->q_ptr->loadingChanged(
+            QWebViewLoadRequest(qDarwinWebViewPrivate->url(),
+                                QWebViewLoadRequest::LoadStatus::LoadStartedStatus, QString()));
     emit qDarwinWebViewPrivate->q_ptr->loadProgressChanged(qDarwinWebViewPrivate->loadProgress());
 }
 
@@ -104,8 +106,9 @@ typedef NSView UIView;
         return;
 
     [self pageDone];
-    emit qDarwinWebViewPrivate->q_ptr->loadingChanged(QWebViewLoadRequestPrivate(
-            qDarwinWebViewPrivate->url(), QWebView::LoadSucceededStatus, QString()));
+    emit qDarwinWebViewPrivate->q_ptr->loadingChanged(
+            QWebViewLoadRequest(qDarwinWebViewPrivate->url(),
+                                QWebViewLoadRequest::LoadStatus::LoadSucceededStatus, QString()));
 }
 
 - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation
@@ -316,11 +319,12 @@ void QDarwinWebViewPrivate::setUrl(const QUrl &url)
             if (!QFile::exists(url.toLocalFile())) {
                 QMetaObject::invokeMethod(
                         q_ptr, &QWebView::loadingChanged, Qt::QueuedConnection,
-                        QWebViewLoadRequestPrivate(url, QWebView::LoadStartedStatus, {}));
+                        QWebViewLoadRequest(url, QWebViewLoadRequest::LoadStatus::LoadStartedStatus,
+                                            {}));
                 QMetaObject::invokeMethod(
                         q_ptr, &QWebView::loadingChanged, Qt::QueuedConnection,
-                        QWebViewLoadRequestPrivate(url, QWebView::LoadFailedStatus,
-                                                   QStringLiteral("File does not exist")));
+                        QWebViewLoadRequest(url, QWebViewLoadRequest::LoadStatus::LoadFailedStatus,
+                                            QStringLiteral("File does not exist")));
                 return;
             }
             // We need to pass local files via loadFileURL and the read access should cover
@@ -335,9 +339,10 @@ void QDarwinWebViewPrivate::setUrl(const QUrl &url)
             [wkWebView loadRequest:[NSURLRequest requestWithURL:url.toNSURL()]];
         }
     } else {
-        QMetaObject::invokeMethod(q_ptr, &QWebView::loadingChanged, Qt::QueuedConnection,
-                                  QWebViewLoadRequestPrivate(url, QWebView::LoadFailedStatus,
-                                                             QStringLiteral("Invalid URL")));
+        QMetaObject::invokeMethod(
+                q_ptr, &QWebView::loadingChanged, Qt::QueuedConnection,
+                QWebViewLoadRequest(url, QWebViewLoadRequest::LoadStatus::LoadFailedStatus,
+                                    QStringLiteral("Invalid URL")));
     }
 }
 
diff --git a/src/plugins/webengine/qwebenginewebview.cpp b/src/plugins/webengine/qwebenginewebview.cpp
index ff7fb7c..5524c5c 100644
--- a/src/plugins/webengine/qwebenginewebview.cpp
+++ b/src/plugins/webengine/qwebenginewebview.cpp
@@ -190,9 +190,10 @@ void QWebEngineWebViewPrivate::q_titleChanged()
 
 void QWebEngineWebViewPrivate::q_loadingChanged(const QWebEngineLoadingInfo &loadRequest)
 {
-    QWebViewLoadRequestPrivate lr(loadRequest.url(),
-                                  static_cast<QWebView::LoadStatus>(loadRequest.status()), // These "should" match...
-                                  loadRequest.errorString());
+    QWebViewLoadRequest lr(loadRequest.url(),
+                           static_cast<QWebViewLoadRequest::LoadStatus>(
+                                   loadRequest.status()), // These "should" match...
+                           loadRequest.errorString());
     emit q_ptr->loadingChanged(lr);
 }
 
diff --git a/src/plugins/windows/qwebview2webview.cpp b/src/plugins/windows/qwebview2webview.cpp
index 50789a8..e5dda9e 100644
--- a/src/plugins/windows/qwebview2webview.cpp
+++ b/src/plugins/windows/qwebview2webview.cpp
@@ -336,8 +336,8 @@ void QWebView2WebViewPrivate::setUrl(const QUrl &url)
             m_isLoading = false;
             m_progress = 100;
             emit q_ptr->loadProgressChanged(100);
-            emit q_ptr->loadingChanged(
-                    QWebViewLoadRequestPrivate(url, QWebView::LoadFailedStatus, QString()));
+            emit q_ptr->loadingChanged(QWebViewLoadRequest(
+                    url, QWebViewLoadRequest::LoadStatus::LoadFailedStatus, QString()));
         }
     }
 }
@@ -565,9 +565,9 @@ HRESULT QWebView2WebViewPrivate::onNavigationCompleted(ICoreWebView2* webview, I
     BOOL isSuccess;
     HRESULT hr = args->get_IsSuccess(&isSuccess);
     Q_ASSERT_SUCCEEDED(hr);
-    const QWebView::LoadStatus status = isSuccess ?
-            QWebView::LoadSucceededStatus :
-            QWebView::LoadFailedStatus;
+    const QWebViewLoadRequest::LoadStatus status = isSuccess
+            ? QWebViewLoadRequest::LoadStatus::LoadSucceededStatus
+            : QWebViewLoadRequest::LoadStatus::LoadFailedStatus;
 
     COREWEBVIEW2_WEB_ERROR_STATUS errorStatus;
     hr = args->get_WebErrorStatus(&errorStatus);
@@ -576,10 +576,10 @@ HRESULT QWebView2WebViewPrivate::onNavigationCompleted(ICoreWebView2* webview, I
         const QString errorStr = isSuccess ? "" : WebErrorStatusToString(errorStatus);
         emit q_ptr->titleChanged(title());
         emit q_ptr->loadProgressChanged(100);
-        emit q_ptr->loadingChanged(QWebViewLoadRequestPrivate(m_url, status, errorStr));
+        emit q_ptr->loadingChanged(QWebViewLoadRequest(m_url, status, errorStr));
     } else {
-        emit q_ptr->loadingChanged(
-                QWebViewLoadRequestPrivate(m_url, QWebView::LoadStoppedStatus, QString()));
+        emit q_ptr->loadingChanged(QWebViewLoadRequest(
+                m_url, QWebViewLoadRequest::LoadStatus::LoadStoppedStatus, QString()));
     }
     return S_OK;
 }
@@ -614,8 +614,8 @@ HRESULT QWebView2WebViewPrivate::onContentLoading(ICoreWebView2* webview, ICoreW
 {
     m_isLoading = true;
     m_progress = 0;
-    emit q_ptr->loadingChanged(
-            QWebViewLoadRequestPrivate(m_url, QWebView::LoadStartedStatus, QString()));
+    emit q_ptr->loadingChanged(QWebViewLoadRequest(
+            m_url, QWebViewLoadRequest::LoadStatus::LoadStartedStatus, QString()));
     emit q_ptr->loadProgressChanged(0);
     return S_OK;
 }
diff --git a/src/quick/qquickwebview.cpp b/src/quick/qquickwebview.cpp
index a199536..26d8328 100644
--- a/src/quick/qquickwebview.cpp
+++ b/src/quick/qquickwebview.cpp
@@ -353,7 +353,7 @@ void QQuickWebView::onRunJavaScriptResult(int id, const QVariant &variant)
     callback.call(args);
 }
 
-void QQuickWebView::onLoadingChanged(const QWebViewLoadRequestPrivate &loadRequest)
+void QQuickWebView::onLoadingChanged(const QWebViewLoadRequest &loadRequest)
 {
     QQuickWebViewLoadRequest qqLoadRequest(loadRequest);
     Q_EMIT loadingChanged(&qqLoadRequest);
diff --git a/src/quick/qquickwebview_p.h b/src/quick/qquickwebview_p.h
index 608580a..4e8d5c7 100644
--- a/src/quick/qquickwebview_p.h
+++ b/src/quick/qquickwebview_p.h
@@ -29,7 +29,7 @@ Q_MOC_INCLUDE(<QtWebView/qwebviewloadrequest.h>)
 QT_BEGIN_NAMESPACE
 
 class QQuickWebViewLoadRequest;
-class QWebViewLoadRequestPrivate;
+class QWebViewLoadRequest;
 class QQuickWebViewSettings;
 
 class Q_WEBVIEWQUICK_EXPORT QQuickWebView : public QQuickWindowContainer
@@ -98,7 +98,7 @@ protected:
 
 private Q_SLOTS:
     void onRunJavaScriptResult(int id, const QVariant &variant);
-    void onLoadingChanged(const QWebViewLoadRequestPrivate &loadRequest);
+    void onLoadingChanged(const QWebViewLoadRequest &loadRequest);
 
 private:
     friend class QWebEngineWebViewPrivate;
diff --git a/src/quick/qquickwebviewloadrequest.cpp b/src/quick/qquickwebviewloadrequest.cpp
index 3684195..251c4ce 100644
--- a/src/quick/qquickwebviewloadrequest.cpp
+++ b/src/quick/qquickwebviewloadrequest.cpp
@@ -18,8 +18,8 @@ QT_BEGIN_NAMESPACE
 
     \sa {WebView::loadingChanged()}{WebView.loadingChanged()}
 */
-QQuickWebViewLoadRequest::QQuickWebViewLoadRequest(const QWebViewLoadRequestPrivate &d)
-    : d_ptr(new QWebViewLoadRequestPrivate(d))
+QQuickWebViewLoadRequest::QQuickWebViewLoadRequest(const QWebViewLoadRequest &d)
+    : d_ptr(new QWebViewLoadRequest(d))
 {
 }
 
@@ -33,8 +33,7 @@ QQuickWebViewLoadRequest::~QQuickWebViewLoadRequest() { }
  */
 QUrl QQuickWebViewLoadRequest::url() const
 {
-    Q_D(const QWebViewLoadRequest);
-    return d->m_url;
+    return d_ptr->url();
 }
 
 /*!
@@ -51,8 +50,7 @@ QUrl QQuickWebViewLoadRequest::url() const
 */
 QQuickWebView::LoadStatus QQuickWebViewLoadRequest::status() const
 {
-    Q_D(const QWebViewLoadRequest);
-    return QQuickWebView::LoadStatus(d->m_status);
+    return QQuickWebView::LoadStatus(d_ptr->status());
 }
 
 /*!
@@ -63,8 +61,7 @@ QQuickWebView::LoadStatus QQuickWebViewLoadRequest::status() const
 */
 QString QQuickWebViewLoadRequest::errorString() const
 {
-    Q_D(const QWebViewLoadRequest);
-    return d->m_errorString;
+    return d_ptr->errorString();
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/qquickwebviewloadrequest_p.h b/src/quick/qquickwebviewloadrequest_p.h
index c77cdc6..5285c3f 100644
--- a/src/quick/qquickwebviewloadrequest_p.h
+++ b/src/quick/qquickwebviewloadrequest_p.h
@@ -22,7 +22,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWebViewLoadRequestPrivate;
+class QWebViewLoadRequest;
 
 class Q_WEBVIEWQUICK_EXPORT QQuickWebViewLoadRequest : public QObject
 {
@@ -44,9 +44,8 @@ public:
 
 private:
     friend class QQuickWebView;
-    explicit QQuickWebViewLoadRequest(const QWebViewLoadRequestPrivate &d);
-    Q_DECLARE_PRIVATE(QWebViewLoadRequest)
-    QScopedPointer<QWebViewLoadRequestPrivate> d_ptr;
+    explicit QQuickWebViewLoadRequest(const QWebViewLoadRequest &d);
+    QScopedPointer<QWebViewLoadRequest> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/webview/qabstractwebview_p.h b/src/webview/qabstractwebview_p.h
index d27affe..bf57f10 100644
--- a/src/webview/qabstractwebview_p.h
+++ b/src/webview/qabstractwebview_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class QWebView;
 class QWebViewSettings;
-class QWebViewLoadRequestPrivate;
+class QWebViewLoadRequest;
 
 class Q_WEBVIEW_EXPORT QAbstractWebViewSettings : public QObject
 {
diff --git a/src/webview/qwebview.cpp b/src/webview/qwebview.cpp
index 470bbea..268c290 100644
--- a/src/webview/qwebview.cpp
+++ b/src/webview/qwebview.cpp
@@ -19,7 +19,7 @@ QWebView::QWebView(QWindow *parent)
 {
     Q_ASSERT(d);
     d->setParent(this);
-    qRegisterMetaType<QWebViewLoadRequestPrivate>();
+    qRegisterMetaType<QWebViewLoadRequest>();
 }
 
 QWebView::~QWebView()
diff --git a/src/webview/qwebview.h b/src/webview/qwebview.h
index 9c0a526..9ed4524 100644
--- a/src/webview/qwebview.h
+++ b/src/webview/qwebview.h
@@ -29,7 +29,7 @@ class tst_QWebView;
 QT_BEGIN_NAMESPACE
 
 class QAbstractWebView;
-class QWebViewLoadRequestPrivate;
+class QWebViewLoadRequest;
 class QWindow;
 class QWebViewSettings;
 
@@ -37,13 +37,6 @@ class Q_WEBVIEW_EXPORT QWebView : public QWindow
 {
     Q_OBJECT
 public:
-    enum LoadStatus { // Changes here needs to be done in QQuickWebView as well
-        LoadStartedStatus,
-        LoadStoppedStatus,
-        LoadSucceededStatus,
-        LoadFailedStatus
-    };
-
     explicit QWebView(QWindow *parent = nullptr);
     ~QWebView() override;
 
@@ -71,7 +64,7 @@ public:
 Q_SIGNALS:
     void titleChanged(const QString &title);
     void urlChanged(const QUrl &url);
-    void loadingChanged(const QWebViewLoadRequestPrivate &loadRequest);
+    void loadingChanged(const QWebViewLoadRequest &loadRequest);
     void loadProgressChanged(int progress);
     void javaScriptResult(int id, const QVariant &result);
     void httpUserAgentChanged(const QString &agent);
diff --git a/src/webview/qwebviewloadrequest.cpp b/src/webview/qwebviewloadrequest.cpp
index a022f87..aecf668 100644
--- a/src/webview/qwebviewloadrequest.cpp
+++ b/src/webview/qwebviewloadrequest.cpp
@@ -6,24 +6,31 @@
 
 QT_BEGIN_NAMESPACE
 
-QWebViewLoadRequestPrivate::QWebViewLoadRequestPrivate()
-{
+QWebViewLoadRequest::QWebViewLoadRequest() { }
 
+QWebViewLoadRequest::QWebViewLoadRequest(const QUrl &url, LoadStatus status,
+                                         const QString &errorString)
+    : m_url(url), m_status(status), m_errorString(errorString)
+{
 }
 
-QWebViewLoadRequestPrivate::QWebViewLoadRequestPrivate(const QUrl &url,
-                                                       QWebView::LoadStatus status,
-                                                       const QString &errorString)
-    : m_url(url)
-    , m_status(status)
-    , m_errorString(errorString)
-{
+QWebViewLoadRequest::~QWebViewLoadRequest() { }
+
+// FIXME add c++ docs
 
+QUrl QWebViewLoadRequest::url() const
+{
+    return m_url;
 }
 
-QWebViewLoadRequestPrivate::~QWebViewLoadRequestPrivate()
+QWebViewLoadRequest::LoadStatus QWebViewLoadRequest::status() const
 {
+    return m_status;
+}
 
+QString QWebViewLoadRequest::errorString() const
+{
+    return m_errorString;
 }
 
 QT_END_NAMESPACE
diff --git a/src/webview/qwebviewloadrequest.h b/src/webview/qwebviewloadrequest.h
index 4e49673..aee9511 100644
--- a/src/webview/qwebviewloadrequest.h
+++ b/src/webview/qwebviewloadrequest.h
@@ -2,42 +2,49 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 // Qt-Security score:significant reason:default
 
-#ifndef QWEBVIEWLOADREQUESTPRIVATE_H
-#define QWEBVIEWLOADREQUESTPRIVATE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
+#ifndef QWEBVIEWLOADREQUEST_H
+#define QWEBVIEWLOADREQUEST_H
 
 #include <QtWebView/qwebview.h>
+
 #include <QtCore/qstring.h>
 #include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBVIEW_EXPORT QWebViewLoadRequestPrivate
+class Q_WEBVIEW_EXPORT QWebViewLoadRequest
 {
-public:
-    QWebViewLoadRequestPrivate();
-    QWebViewLoadRequestPrivate(const QUrl &url,
-                               QWebView::LoadStatus status,
-                               const QString &errorString);
-    ~QWebViewLoadRequestPrivate();
+    Q_GADGET
+    Q_PROPERTY(QUrl url READ url CONSTANT)
+    Q_PROPERTY(LoadStatus status READ status CONSTANT)
+    Q_PROPERTY(QString errorString READ errorString CONSTANT)
+    Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
 
+public:
+    enum class LoadStatus {
+        LoadStartedStatus,
+        LoadStoppedStatus,
+        LoadSucceededStatus,
+        LoadFailedStatus
+    };
+    Q_ENUM(LoadStatus)
+
+    QWebViewLoadRequest();
+    QWebViewLoadRequest(const QUrl &url, LoadStatus status, const QString &errorString);
+    ~QWebViewLoadRequest();
+
+    QUrl url() const;
+    LoadStatus status() const;
+    QString errorString() const;
+
+private:
     QUrl m_url;
-    QWebView::LoadStatus m_status;
+    LoadStatus m_status;
     QString m_errorString;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QWebViewLoadRequestPrivate)
+Q_DECLARE_METATYPE(QWebViewLoadRequest)
 
-#endif // QWEBVIEWLOADREQUESTPRIVATE_H
+#endif // QWEBVIEWLOADREQUEST_H
diff --git a/tests/auto/webview/qwebview/tst_qwebview.cpp b/tests/auto/webview/qwebview/tst_qwebview.cpp
index eb01570..85108e7 100644
--- a/tests/auto/webview/qwebview/tst_qwebview.cpp
+++ b/tests/auto/webview/qwebview/tst_qwebview.cpp
@@ -110,7 +110,7 @@ void tst_QWebView::loadHtml_data()
     QTest::addColumn<QUrl>("resultUrl");
     QWebView view;
     QCOMPARE(view.loadProgress(), 0);
-    QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate)));
+    QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequest)));
     const QByteArray content(
             QByteArrayLiteral("<html><title>WebViewTitle</title>"
                               "<body><span style=\"color:#ff0000\">Hello</span></body></html>"));
@@ -141,7 +141,7 @@ void tst_QWebView::loadHtml()
 
     QWebView view;
     QCOMPARE(view.loadProgress(), 0);
-    QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate)));
+    QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequest)));
     QSignalSpy javaScriptResultSpy(&view, SIGNAL(javaScriptResult(int, QVariant)));
     view.loadHtml(content, loadUrl);
     QTRY_COMPARE(view.loadProgress(), 100);
@@ -149,8 +149,8 @@ void tst_QWebView::loadHtml()
     QCOMPARE(view.title(), QStringLiteral("WebViewTitle"));
     QTRY_COMPARE(loadChangedSingalSpy.size(), 2);
     // take load finished
-    const QWebViewLoadRequestPrivate &lr = loadChangedSingalSpy.at(1).at(0).value<QWebViewLoadRequestPrivate>();
-    QCOMPARE(lr.m_status, QWebView::LoadSucceededStatus);
+    const QWebViewLoadRequest &lr = loadChangedSingalSpy.at(1).at(0).value<QWebViewLoadRequest>();
+    QCOMPARE(lr.status(), QWebViewLoadRequest::LoadStatus::LoadSucceededStatus);
     if (QWebViewFactory::loadedPluginHasKey("android_view")) {
         // WebEngine javascript calls work only with qmlengine, however here we use
         // c++ interface
@@ -183,7 +183,7 @@ void tst_QWebView::loadRequest()
         view.settings()->setLocalContentCanAccessFileUrls(true);
         QCOMPARE(view.loadProgress(), 0);
         const QUrl url = QUrl::fromLocalFile(fileName);
-        QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate)));
+        QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequest)));
         view.setUrl(url);
         QTRY_VERIFY(!view.isLoading());
         QTRY_COMPARE(view.loadProgress(), 100);
@@ -192,13 +192,13 @@ void tst_QWebView::loadRequest()
         QTRY_COMPARE(loadChangedSingalSpy.size(), 2);
         {
             const QList<QVariant> &loadStartedArgs = loadChangedSingalSpy.takeFirst();
-            const QWebViewLoadRequestPrivate &lr = loadStartedArgs.at(0).value<QWebViewLoadRequestPrivate>();
-            QCOMPARE(lr.m_status, QWebView::LoadStartedStatus);
+            const QWebViewLoadRequest &lr = loadStartedArgs.at(0).value<QWebViewLoadRequest>();
+            QCOMPARE(lr.status(), QWebViewLoadRequest::LoadStatus::LoadStartedStatus);
         }
         {
             const QList<QVariant> &loadStartedArgs = loadChangedSingalSpy.takeFirst();
-            const QWebViewLoadRequestPrivate &lr = loadStartedArgs.at(0).value<QWebViewLoadRequestPrivate>();
-            QCOMPARE(lr.m_status, QWebView::LoadSucceededStatus);
+            const QWebViewLoadRequest &lr = loadStartedArgs.at(0).value<QWebViewLoadRequest>();
+            QCOMPARE(lr.status(), QWebViewLoadRequest::LoadStatus::LoadSucceededStatus);
         }
     }
 
@@ -208,19 +208,19 @@ void tst_QWebView::loadRequest()
         view.settings()->setAllowFileAccess(true);
         view.settings()->setLocalContentCanAccessFileUrls(true);
         QCOMPARE(view.loadProgress(), 0);
-        QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate)));
+        QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequest)));
         view.setUrl(QUrl(QStringLiteral("file:///file_that_does_not_exist.html")));
         QTRY_VERIFY(!view.isLoading());
         QTRY_COMPARE(loadChangedSingalSpy.size(), 2);
         {
             const QList<QVariant> &loadStartedArgs = loadChangedSingalSpy.takeFirst();
-            const QWebViewLoadRequestPrivate &lr = loadStartedArgs.at(0).value<QWebViewLoadRequestPrivate>();
-            QCOMPARE(lr.m_status, QWebView::LoadStartedStatus);
+            const QWebViewLoadRequest &lr = loadStartedArgs.at(0).value<QWebViewLoadRequest>();
+            QCOMPARE(lr.status(), QWebViewLoadRequest::LoadStatus::LoadStartedStatus);
         }
         {
             const QList<QVariant> &loadStartedArgs = loadChangedSingalSpy.takeFirst();
-            const QWebViewLoadRequestPrivate &lr = loadStartedArgs.at(0).value<QWebViewLoadRequestPrivate>();
-            QCOMPARE(lr.m_status, QWebView::LoadFailedStatus);
+            const QWebViewLoadRequest &lr = loadStartedArgs.at(0).value<QWebViewLoadRequest>();
+            QCOMPARE(lr.status(), QWebViewLoadRequest::LoadStatus::LoadFailedStatus);
         }
         if (QWebViewFactory::loadedPluginHasKey("webengine"))
             QCOMPARE(view.loadProgress(), 100);
author	Kaloyan Chehlarski <kaloyan.chehlarski@qt.io>	2025-11-25 12:58:37 +0100
committer	Michal Klocek <michal.klocek@qt.io>	2025-12-01 16:02:53 +0100
commit	3aa448809c7e3f9631d30d9bbfc62c7933bc93f5 (patch)
tree	8f593153c03becdf22b2f90c39e7b2c781ed1d79
parent	7721af5cb47fd2656124ffa9fe08faea44835463 (diff)