From 7a57358683ee3a04c15d55b6475594aa81febf6f Mon Sep 17 00:00:00 2001 From: Kirill Burtsev 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 --- .../quick/inspectorserver/tst_inspectorserver.cpp | 6 ++-- tests/auto/quick/publicapi/tst_publicapi.cpp | 38 +++++++++++----------- .../tst_qquickwebenginedefaultsurfaceformat.cpp | 6 ++-- .../tst_qquickwebengineview.cpp | 6 ++-- tests/auto/util/quickutil.h | 13 ++++---- 5 files changed, 34 insertions(+), 35 deletions(-) (limited to 'tests/auto') 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 #include #include -#include +#include #include #include #include @@ -82,7 +82,7 @@ static const QList typesToCheck = QList 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 #include #include -#include -#include +#include #include #include @@ -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); } -- cgit v1.2.3