diff --git a/src/3rdparty b/src/3rdparty index 600b273256015db194640549e57199cef6e07902..f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 600b273256015db194640549e57199cef6e07902 +Subproject commit f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 375d898948d794a5e05e0671c6a7b57405c3d752..0d48724de6b28712952a27c74af17024fa2708a9 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -12,6 +12,3 @@ osx [WebEngineViewLoadUrl::test_urlProperty] windows - -[WebViewFindText::test_findTextManyMatches] -* diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml index 904a8feb2d68fda4f141abf07cb600f269664a76..4761513c1e7f20a6c7087b043bc7e6b0fcf8b065 100644 --- a/tests/auto/quick/qmltests/data/tst_findText.qml +++ b/tests/auto/quick/qmltests/data/tst_findText.qml @@ -107,5 +107,24 @@ TestWebEngineView { tryCompare(webEngineView, "matchCount", 0) verify(findFailed) } + + function test_findTextAfterNotFound() { + var findFlags = 0 + webEngineView.url = Qt.resolvedUrl("about:blank") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.findText("hello", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 0) + verify(findFailed) + + webEngineView.url = Qt.resolvedUrl("test1.html") + verify(webEngineView.waitForLoadSucceeded()) + + webEngineView.clear() + webEngineView.findText("hello", findFlags, webEngineView.findTextCallback) + tryCompare(webEngineView, "matchCount", 1) + verify(!findFailed) + } } } diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index cc5434807783ee7611a454bd4691b18c6f1f1fa7..726519db2aa95efb995707067ea52c3e7f2b5f27 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -45,6 +45,7 @@ OTHER_FILES += \ $$PWD/data/tst_favicon.qml \ $$PWD/data/tst_faviconDownload.qml \ $$PWD/data/tst_filePicker.qml \ + $$PWD/data/tst_findText.qml \ $$PWD/data/tst_focusOnNavigation.qml \ $$PWD/data/tst_formValidation.qml \ $$PWD/data/tst_geopermission.qml \