From 9cfde2edf4736ae9533e7e1fac495a23ad905419 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 20 May 2019 14:17:47 +0200 Subject: Adaptations for Chromium 75 Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3 Reviewed-by: Peter Varga --- tests/auto/widgets/accessibility/tst_accessibility.cpp | 1 + tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 6 +++--- tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp index b0165cfbc..d69a4c0a7 100644 --- a/tests/auto/widgets/accessibility/tst_accessibility.cpp +++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp @@ -389,6 +389,7 @@ void tst_Accessibility::roles() QWebEngineView webView; webView.setHtml("" + html + ""); + webView.show(); QSignalSpy spyFinished(&webView, &QWebEngineView::loadFinished); QVERIFY(spyFinished.wait()); diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 1c9e6c7b1..27f2a9c2b 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -302,9 +302,9 @@ protected: { Q_UNUSED(url); Q_UNUSED(isMainFrame); - if (type == QWebEnginePage::NavigationTypeFormSubmitted) - return m_acceptNavigationRequest; - return true; + if (type == QWebEnginePage::NavigationTypeTyped) + return true; + return m_acceptNavigationRequest; } }; diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp index 487e70d28..1ba9c13e8 100644 --- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp +++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp @@ -180,7 +180,7 @@ void tst_QWebEngineScript::loadEvents() // Cross-process navigation page.load(QUrl("chrome://gpu")); - QTRY_COMPARE(page.spy.count(), 1); + QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000); QCOMPARE(page.spy.takeFirst().value(0).toBool(), true); QCOMPARE(page.eval("window.log", QWebEngineScript::MainWorld).toStringList(), expected); QCOMPARE(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList(), expected); -- cgit v1.2.3