diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-05 17:09:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-05 17:09:46 +0100 |
| commit | 79f5361400fa91b30cc4a1b34335b49284ba3e07 (patch) | |
| tree | 3c5f79b230ff4c83b441cba5df7da357bc9c4f2e /src/core/profile_io_data_qt.h | |
| parent | bc1529f56b8c86259c7f952b0ea9b439f5cc8d53 (diff) | |
| parent | 34b714122051eae86ac49fd95c7015fb081f79eb (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_adapter_client.h
src/webenginewidgets/api/qwebenginepage_p.h
Change-Id: Ibd011c40839c09469218ac4c71a13d0a0b1c9778
Diffstat (limited to 'src/core/profile_io_data_qt.h')
| -rw-r--r-- | src/core/profile_io_data_qt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h index 949497c71..b7706f190 100644 --- a/src/core/profile_io_data_qt.h +++ b/src/core/profile_io_data_qt.h @@ -120,7 +120,7 @@ private: scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate; content::URLRequestInterceptorScopedVector m_requestInterceptors; content::ProtocolHandlerMap m_protocolHandlers; - proxy_resolver::mojom::ProxyResolverFactoryPtr m_proxyResolverFactory; + mojo::InterfacePtrInfo<proxy_resolver::mojom::ProxyResolverFactory> m_proxyResolverFactoryInterface; net::URLRequestJobFactoryImpl *m_baseJobFactory = nullptr; QAtomicPointer<net::ProxyConfigService> m_proxyConfigService; QPointer<ProfileAdapter> m_profileAdapter; // never dereferenced in IO thread and it is passed by qpointer |