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

Conflicts:
	.qmake.conf
	src/core/net/network_delegate_qt.cpp
	src/core/profile_io_data_qt.cpp
	src/core/web_engine_context.h
	tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp

Change-Id: Id98e3f52f548ceb5b68abd80aedd6ae59db72cc0

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 6f984c24c..d2c121e65 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3159,9 +3159,10 @@ void tst_QWebEnginePage::triggerActionWithoutMenu()
 void tst_QWebEnginePage::dynamicFrame()
 {
     QWebEnginePage page;
+    page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
     page.load(QStringLiteral("qrc:/resources/dynamicFrame.html"));
-    QVERIFY(spy.wait());
+    QTRY_COMPARE(spy.count(), 1);
     QCOMPARE(toPlainTextSync(&page).trimmed(), QStringLiteral("foo"));
 }