summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2017-07-11 15:56:12 +0200
committerKai Koehne <kai.koehne@qt.io>2017-07-11 15:57:02 +0200
commita39a36d115629eb1190d4281d4032db557ff6ff0 (patch)
treec2572956ce60458a340d5f5716277642451a8e33 /tests
parentec73b97ab7bb70178e58fd3bf59e88a168c73f87 (diff)
parent630f7b24f67646b05a2222761b192316123d8931 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qmltests/data/tst_findText.qml6
1 files changed, 3 insertions, 3 deletions
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; });
}
}
}