diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-11 10:57:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-11 10:57:50 +0200 |
commit | d41f0bed7ddbdacb4f6444a84773a029e46988f3 (patch) | |
tree | 15a68979470278f0c13b2521cb614d5670288271 /src/core/profile_io_data_qt.h | |
parent | 0caabd54a24ffa3a2d2de5cb6f1fce2af3588eb7 (diff) | |
parent | a2c365cb1f22431845380159c29048da76c2b2a9 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
Change-Id: I64b46801bbaac4e96e32fece30f24f1d6cfc97a4
Diffstat (limited to 'src/core/profile_io_data_qt.h')
-rw-r--r-- | src/core/profile_io_data_qt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h index c9e73f778..570365085 100644 --- a/src/core/profile_io_data_qt.h +++ b/src/core/profile_io_data_qt.h @@ -157,6 +157,7 @@ private: std::unique_ptr<net::HttpAuthPreferences> m_httpAuthPreferences; std::unique_ptr<net::URLRequestJobFactory> m_jobFactory; std::unique_ptr<net::TransportSecurityPersister> m_transportSecurityPersister; + std::unique_ptr<net::HostResolver> m_hostResolver; base::WeakPtr<ProfileIODataQt> m_weakPtr; scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate; content::URLRequestInterceptorScopedVector m_requestInterceptors; |