From 630f7b24f67646b05a2222761b192316123d8931 Mon Sep 17 00:00:00 2001 From: Viktor Engelmann Date: Mon, 26 Jun 2017 16:26:01 +0200 Subject: Call stopFinding, when navigating away When one searches for text on one page and then navigates away, results for the search-term are also highlighted on the new page. To stop this from happening, we now call adapter->stopFinding() when we navigate away from a page. Task-number: QTBUG-61506 Change-Id: I09e064d7788b12eae0a67c01e4f5872d94924617 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/qmltests/data/tst_findText.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/quick/qmltests/data') 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; }); } } } -- cgit v1.2.3