4 files changed, 14 insertions, 5 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index c39c1f1c0..b0723e333 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -46,8 +46,13 @@ use?(webrtc) {
 use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
 CONFIG(release, debug|release) {
-    force_debug_info: gn_args += symbol_level=1
-    else: gn_args += symbol_level=0
+    force_debug_info {
+        # Level 1 is not enough to generate all Chromium debug symbols on Windows
+        msvc: gn_args += symbol_level=2
+        else: gn_args += symbol_level=1
+    } else {
+        gn_args += symbol_level=0
+    }
 }
 
 !webcore_debug: gn_args += remove_webcore_debug_symbols=true
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 1fceb4366..c5c772411 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -358,6 +358,8 @@ void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const Q
     Q_EMIT q->navigationRequested(&navigationRequest);
 
     navigationRequestAction = navigationRequest.action();
+    if ((navigationRequestAction == WebContentsAdapterClient::AcceptRequest) && adapter)
+        adapter->stopFinding();
 }
 
 void QQuickWebEngineViewPrivate::javascriptDialog(QSharedPointer<JavaScriptDialogController> dialog)
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index d0305f81a..87af187e3 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1505,6 +1505,8 @@ void QWebEnginePagePrivate::navigationRequested(int navigationType, const QUrl &
 {
     Q_Q(QWebEnginePage);
     bool accepted = q->acceptNavigationRequest(url, static_cast<QWebEnginePage::NavigationType>(navigationType), isMainFrame);
+    if (accepted && adapter)
+        adapter->stopFinding();
     navigationRequestAction = accepted ? WebContentsAdapterClient::AcceptRequest : WebContentsAdapterClient::IgnoreRequest;
 }
 
diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml
index 8526012c9..f8730ca7b 100644
--- a/tests/auto/quick/qmltests/data/tst_findText.qml
+++ b/tests/auto/quick/qmltests/data/tst_findText.qml
@@ -211,9 +211,9 @@ TestWebEngineView {
             if (!webEngineView.waitForLoadSucceeded(12000))
                 skip("Couldn't load page from network, skipping test.");
 
-            // Can't be sure whether the findText succeeded before the new load.
-            // Thus don't check the find result just whether the callback was called.
-            tryVerify(function() { return webEngineView.matchCount != -1; });
+            // The callback is not supposed to be called, see QTBUG-61506.
+            // Check whether the callback was called (-1 = no, other values = yes).
+            tryVerify(function() { return webEngineView.matchCount == -1; });
         }
     }
 }