Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
index 658071005..a521ea0d6 100644
--- a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
+++ b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
@@ -112,6 +112,13 @@ TestWebEngineView {
             simulateUserGesture()
             webEngineView.triggerWebAction(WebEngineView.RequestClose);
             verify(webEngineView.waitForWindowCloseRequested());
+
+            // Navigate away from page with onbeforeunload handler,
+            // otherwise it would trigger an extra dialog request when
+            // navigating in the subsequent test.
+            webEngineView.url = Qt.resolvedUrl("about:blank");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(JSDialogParams.dialogCount, 2)
         }
 
         function test_rejectClose() {
@@ -123,6 +130,14 @@ TestWebEngineView {
             simulateUserGesture()
             webEngineView.triggerWebAction(WebEngineView.RequestClose);
             verify(webEngineView.testSupport.waitForWindowCloseRejected());
+
+            // Navigate away from page with onbeforeunload handler,
+            // otherwise it would trigger an extra dialog request when
+            // navigating in the subsequent test.
+            JSDialogParams.shouldAcceptDialog = true;
+            webEngineView.url = Qt.resolvedUrl("about:blank");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(JSDialogParams.dialogCount, 2)
         }
 
         function test_prompt() {