summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-12-11 13:45:21 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-12-14 15:27:24 +0000
commitd239b60313f798cf75a4e34a768d9f4a1fc8f92a (patch)
treede50e4b589ce378b5fd230748fccd6d525cbcf60
parente34450b1649e3c4bfc5aa64f4e07adec399d5086 (diff)
Stabilize test_urlPropertyv5.6.0-beta1
Pulls in Chromium patches that fixes crashes in the test, and add a missing waitForLoadSucceeded, that otherwise might cause the next test to fail. Task-number: QTBUG-48031 Change-Id: I4844aee0ccf159e50de955f3b3da704160a4a0f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
m---------src/3rdparty0
-rw-r--r--tests/auto/quick/qmltests/data/tst_loadUrl.qml2
2 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 87969dcd98725adaba07b6130c5f434902f6ce2
+Subproject 1ef20b2b10c1650b25d61ab55bc88641f69b66c
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
index c8abf2bb..31296f45 100644
--- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
@@ -144,6 +144,8 @@ TestWebEngineView {
var dataUrl = "data:text/html,foo"
webEngineView.url = dataUrl
compare(webEngineView.url, dataUrl)
+ verify(webEngineView.waitForLoadSucceeded()) // data:text/html,foo is loaded
+ compare(webEngineView.url, dataUrl)
var redirectUrl = Qt.resolvedUrl("redirect.html")
webEngineView.url = redirectUrl