From b2a329d3e136a847a352b5f894ce27bd38abe61c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 21 Sep 2020 12:18:23 +0200 Subject: Update dependencies on 'dev' in qt/qtwebengine Work-around a QtNetwork bug, and QList::resize(0), doing some weird illegal stuff. Change-Id: I1eb178b121b9dcdd0a9f6d71d121956ddb5eb2a3 Reviewed-by: Michal Klocek --- tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests/auto/quick/inspectorserver') diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp index 85257fcb7..1f30fce5b 100644 --- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp +++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp @@ -105,8 +105,15 @@ inline QQuickWebEngineView* tst_InspectorServer::webView() const QJsonArray tst_InspectorServer::fetchPageList() const { QNetworkAccessManager qnam; - QScopedPointer reply(qnam.get(QNetworkRequest(s_inspectorServerHttpBaseUrl.resolved(QUrl("json/list"))))); - QSignalSpy(reply.data(), SIGNAL(finished())).wait(); + QSignalSpy spy(&qnam, &QNetworkAccessManager::finished);; + QNetworkRequest request(s_inspectorServerHttpBaseUrl.resolved(QUrl("json/list"))); + QScopedPointer reply(qnam.get(request)); + spy.wait(); + // Work-around a network bug in Qt6: + if (reply->error() == QNetworkReply::ContentNotFoundError) { + reply.reset(qnam.get(request)); + spy.wait(); + } return QJsonDocument::fromJson(reply->readAll()).array(); } -- cgit v1.2.3