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

Conflicts:
	.qmake.conf
	configure.json

examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js

examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json

examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc
	mkspecs/features/platform.prf
	src/3rdparty
	src/core/media_capture_devices_dispatcher.cpp
	src/core/net/url_request_context_getter_qt.cpp
	src/core/net/url_request_context_getter_qt.h
	src/core/web_contents_adapter.cpp

Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
index 14786e5b0..606d05d9e 100644
--- a/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
+++ b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
@@ -30,6 +30,7 @@
 #include "../util.h"
 
 #include <qwebenginepage.h>
+#include <qwebengineprofile.h>
 #include <qwebenginesettings.h>
 #include <qwebengineview.h>
 
@@ -65,13 +66,16 @@ private Q_SLOTS:
 private:
     QWebEngineView *m_view;
     QWebEnginePage *m_page;
+    QWebEngineProfile *m_profile;
 };
 
 
 void tst_FaviconManager::init()
 {
+    m_profile = new QWebEngineProfile(this);
     m_view = new QWebEngineView();
-    m_page = m_view->page();
+    m_page = new QWebEnginePage(m_profile, m_view);
+    m_view->setPage(m_page);
 }
 
 
@@ -87,6 +91,7 @@ void tst_FaviconManager::cleanupTestCase()
 void tst_FaviconManager::cleanup()
 {
     delete m_view;
+    delete m_profile;
 }
 
 void tst_FaviconManager::faviconLoad()