summaryrefslogtreecommitdiffstats
path: root/tests/auto/util
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2021-02-19 20:38:07 +0100
committerKirill Burtsev <kirill.burtsev@qt.io>2021-06-04 19:05:00 +0200
commit7a57358683ee3a04c15d55b6475594aa81febf6f (patch)
treeca7c4f47606de2970fb14462e347ebfca33f77f7 /tests/auto/util
parentb3909c2d860a53e85eea51e77ee40ed8adf60842 (diff)
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>
Diffstat (limited to 'tests/auto/util')
-rw-r--r--tests/auto/util/quickutil.h13
1 files changed, 6 insertions, 7 deletions
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 <QSignalSpy>
#include <QTimer>
#include <QtTest/QtTest>
-#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
-#include <QtWebEngineCore/QWebEngineLoadRequest>
+#include <QtWebEngineCore/QWebEngineLoadingInfo>
#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
#include <QGuiApplication>
@@ -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);
}