From d239b60313f798cf75a4e34a768d9f4a1fc8f92a Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 11 Dec 2015 13:45:21 +0100
Subject: [PATCH] Stabilize test_urlProperty
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>
---
src/3rdparty | 2 +-
tests/auto/quick/qmltests/data/tst_loadUrl.qml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/3rdparty b/src/3rdparty
index 87969dcd9..1ef20b2b1 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 87969dcd98725adaba07b6130c5f434902f6ce26
+Subproject commit 1ef20b2b10c1650b25d61ab55bc88641f69b66c8
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
index c8abf2bb0..31296f45c 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
--
GitLab