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.h b/src/core/web_engine_context.h
index cf6834ec4..b9af38153 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -92,9 +92,9 @@ public:
     printing::PrintJobManager* getPrintJobManager();
 #endif
     void initialize();
-    void destroyBrowserContext();
-    void addBrowserContext(ProfileAdapter *profileAdapter);
-    void removeBrowserContext(ProfileAdapter *profileAdapter);
+    void destroyProfileAdapter();
+    void addProfileAdapter(ProfileAdapter *profileAdapter);
+    void removeProfileAdapter(ProfileAdapter *profileAdapter);
     void destroy();
 
     gpu::SyncPointManager *syncPointManager();