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, 3 insertions, 3 deletions

diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 912a6128e..e988fa23c 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -181,13 +181,13 @@ bool usingSoftwareDynamicGL()
 scoped_refptr<QtWebEngineCore::WebEngineContext> WebEngineContext::m_handle;
 bool WebEngineContext::m_destroyed = false;
 
-void WebEngineContext::destroyBrowserContext()
+void WebEngineContext::destroyProfileAdapter()
 {
     if (m_defaultProfileAdapter)
         qWarning("PostMainMessageLoopRun is done, but global profile still exists !");
 }
 
-void WebEngineContext::addBrowserContext(ProfileAdapter *profileAdapter)
+void WebEngineContext::addProfileAdapter(ProfileAdapter *profileAdapter)
 {
     Q_ASSERT(!m_profileAdapters.contains(profileAdapter));
     const QString path = profileAdapter->dataPath();
@@ -203,7 +203,7 @@ void WebEngineContext::addBrowserContext(ProfileAdapter *profileAdapter)
     m_profileAdapters.append(profileAdapter);
 }
 
-void WebEngineContext::removeBrowserContext(ProfileAdapter *profileAdapter)
+void WebEngineContext::removeProfileAdapter(ProfileAdapter *profileAdapter)
 {
     m_profileAdapters.removeAll(profileAdapter);
 }