summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-10-28 08:23:17 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-10-28 08:23:17 +0000
commitba63729ed9a39e122475ac8860cee27fc235241b (patch)
treea9400a773a7279d85b2e2d202e5b011311b81d1a /tests/auto/quick
parentfa435e9b15019b3221be3e93e89fbad8759ad14a (diff)
parent30ec6d65845938c14f14f543309160d445da700d (diff)
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/quick')
-rw-r--r--tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml18
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
index 44836d67c..07236c3be 100644
--- a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
+++ b/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
@@ -83,6 +83,15 @@ TestWebEngineView {
compare(webEngineView.title, "REJECTED")
}
+ function readMousePressRecieved() {
+ var mousePressReceived;
+ runJavaScript("window.mousePressReceived", function(result) {
+ mousePressReceived = result;
+ });
+
+ _waitFor(function() { return mousePressReceived != undefined; });
+ return mousePressReceived;
+ }
function simulateUserGesture() {
// A user gesture after page load is required since Chromium 60 to allow showing
@@ -90,14 +99,7 @@ TestWebEngineView {
// See https://www.chromestatus.com/feature/5082396709879808
mouseClick(webEngineView, 10, 10, Qt.LeftButton)
- var mousePressReceived;
- runJavaScript("window.mousePressReceived", function(result) {
- mousePressReceived = result;
- });
-
- tryVerify(function() {
- return mousePressReceived != undefined
- }, 5000);
+ tryVerify(readMousePressRecieved)
}
function test_confirmClose() {