diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-08-20 16:26:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-21 15:18:19 +0200 |
| commit | be18c1dcfa68328acdf11e0a534749d9a5d75f8b (patch) | |
| tree | 53a7b347d2771f4502338ac973a80a37edacdee7 /tests/auto/widgets/qwebengineview | |
| parent | b74e93a9b07243da4f3d2784cde49916de455364 (diff) | |
| parent | e56dd7e37ea96c4ba1354e319bdaa9d01c401747 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
configure.json
examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js
examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json
examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc
mkspecs/features/platform.prf
src/3rdparty
src/core/media_capture_devices_dispatcher.cpp
src/core/net/url_request_context_getter_qt.cpp
src/core/net/url_request_context_getter_qt.h
src/core/web_contents_adapter.cpp
Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
Diffstat (limited to 'tests/auto/widgets/qwebengineview')
| -rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 286efca56..d01a5365f 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -375,7 +375,7 @@ void tst_QWebEngineView::microFocusCoordinates() QVariant initialMicroFocus = webView.focusProxy()->inputMethodQuery(Qt::ImMicroFocus); evaluateJavaScriptSync(webView.page(), "window.scrollBy(0, 50)"); - QVERIFY(scrollSpy.wait()); + QTRY_VERIFY(scrollSpy.count() > 0); QTRY_VERIFY(webView.focusProxy()->inputMethodQuery(Qt::ImMicroFocus).isValid()); QVariant currentMicroFocus = webView.focusProxy()->inputMethodQuery(Qt::ImMicroFocus); |