diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
| commit | c9a64fda178c32ac924977ac93bf83d7e47767fe (patch) | |
| tree | beaf8671ccbce36b3d4018ce57fe9de29d40d87f /tests/auto/quick/dialogs | |
| parent | 10611866af8736a397371a38d6b5486ee8d28c62 (diff) | |
| parent | 44303861fd116b3a279d26300147e89a0bf8121c (diff) | |
Merge branch '5.12' into 5.13
Conflicts:
src/3rdparty
src/core/renderer/user_resource_controller.cpp
src/core/web_contents_adapter.cpp
src/webengine/doc/src/qtwebengine-overview.qdoc
Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
Diffstat (limited to 'tests/auto/quick/dialogs')
| -rw-r--r-- | tests/auto/quick/dialogs/WebView.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/dialogs/tst_dialogs.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/quick/dialogs/WebView.qml b/tests/auto/quick/dialogs/WebView.qml index 6509071b8..4f8b7a0ce 100644 --- a/tests/auto/quick/dialogs/WebView.qml +++ b/tests/auto/quick/dialogs/WebView.qml @@ -59,6 +59,8 @@ Window { onLoadingChanged: function(reqeust) { if (reqeust.status === WebEngineView.LoadSucceededStatus) { handler.ready = true + } else { + console.log("Wooohooo loading page from qrc failed !") } } diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp index 26a0fe034..eee6b2bb6 100644 --- a/tests/auto/quick/dialogs/tst_dialogs.cpp +++ b/tests/auto/quick/dialogs/tst_dialogs.cpp @@ -116,7 +116,7 @@ void tst_Dialogs::colorDialogRequested() void tst_Dialogs::contextMenuRequested() { m_listner->load(QUrl("qrc:/index.html")); - QTRY_VERIFY(m_listner->ready()); + QTRY_COMPARE_WITH_TIMEOUT(m_listner->ready(), true, 20000); QSignalSpy dialogSpy(m_listner, &TestHandler::requestChanged); QTest::mouseClick(m_widnow, Qt::RightButton); QTRY_COMPARE(dialogSpy.count(), 1); @@ -226,6 +226,7 @@ void tst_Dialogs::javaScriptDialogRequested() QCOMPARE(dialog->type(), type); QCOMPARE(dialog->message(), message); QCOMPARE(dialog->defaultText(), defaultText); + QTRY_VERIFY(m_listner->ready()); // make sure javascript executes no longer } #include "tst_dialogs.moc" |