Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	src/core/api/qwebengineurlrequestjob.cpp
	src/core/browser_context_adapter.cpp
	src/core/renderer/user_resource_controller.cpp
	src/core/web_engine_context.cpp
	src/webenginewidgets/api/qwebenginepage.cpp

Change-Id: I5278e5e22e1776d42975fc94d70ff8ca4f81fb9a

1 files changed, 9 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index c4de46b67..5a6c0e18a 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -155,11 +155,18 @@ QWebEngineBrowserContext::QWebEngineBrowserContext(QSharedPointer<QtWebEngineCor
 
 QWebEngineBrowserContext::~QWebEngineBrowserContext()
 {
+    if (m_profile)
+        shutdown();
+}
+
+void QWebEngineBrowserContext::shutdown()
+{
     Q_ASSERT(m_profile);
     // In the case the user sets this profile as the parent of the interceptor
     // it can be deleted before the browser-context still referencing it is.
     browserContextRef->setRequestInterceptor(nullptr);
     browserContextRef->removeClient(m_profile);
+    m_profile = 0;
 }
 
 QWebEngineProfilePrivate::QWebEngineProfilePrivate(QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContext)
@@ -181,6 +188,8 @@ QWebEngineProfilePrivate::~QWebEngineProfilePrivate()
     }
 
     m_ongoingDownloads.clear();
+    if (m_browserContext)
+        m_browserContext->shutdown();
 }
 
 QSharedPointer<QtWebEngineCore::BrowserContextAdapter> QWebEngineProfilePrivate::browserContext() const