From b2a329d3e136a847a352b5f894ce27bd38abe61c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 <michal.klocek@qt.io>
---
 dependencies.yaml                                        |  8 ++++----
 src/pdf/qpdfsearchmodel.cpp                              |  3 ---
 tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 11 +++++++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 93ab31674..46b961d01 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,6 +1,6 @@
 dependencies:
   ../qtdeclarative:
-    ref: 6a5910c1c6947842500545542ec00ff105326a06
+    ref: 6412bcd2219d2a5c1f8193d8f394ddb1279dee2b
     required: true
 #  ../qtlocation:
 #    ref: a8793c6d9695498b3a53793f21859421262b4541
@@ -9,11 +9,11 @@ dependencies:
 #    ref: 59749d56d666a6687fcedc2f7892080467db8574
 #    required: false
   ../qtquickcontrols2:
-    ref: 2ba4a895a48be6927818008580ab0a88cc8c4e12
+    ref: ccade67a03e40e2a6bab3d028c3ce594e0aa4071
     required: false
   ../qttools:
-    ref: d7e89a71bbbb50122b8175886eed7bdf8a2f6c8d
+    ref: 01d2ebcc1996f17a7e23003970d5ad27fa3d58af
     required: false
   ../qtwebchannel:
-    ref: 4c8cdc0c0a3fdb4c16c57785403cb6d2b2b223d9
+    ref: 711abbcf7b1cf5d5cec497aca35dcbb18e4c1636
     required: false
diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp
index aee28f999..4d4e86cee 100644
--- a/src/pdf/qpdfsearchmodel.cpp
+++ b/src/pdf/qpdfsearchmodel.cpp
@@ -198,9 +198,6 @@ void QPdfSearchModelPrivate::clearResults()
     if (document) {
         searchResults.resize(document->pageCount());
         pagesSearched.resize(document->pageCount());
-    } else {
-        searchResults.resize(0);
-        pagesSearched.resize(0);
     }
     nextPageToUpdate = 0;
     updateTimerId = q->startTimer(UpdateTimerInterval);
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<QNetworkReply> 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<QNetworkReply> 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