diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-15 15:32:08 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-15 16:03:41 +0100 |
commit | c69f510ed6e85c64f02ee0ee030336cd9aa66793 (patch) | |
tree | c2555af8f13b5336047e17548092bf1590f81576 /src/core/profile_io_data_qt.h | |
parent | af30e7857e205990057735a07fe0974af9db8733 (diff) | |
parent | 74d2d301b11f2edfde69f0515e2fd74882ab6dab (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0822fb8a10945a252cfd1aacaf0b6d9902cc8831
Diffstat (limited to 'src/core/profile_io_data_qt.h')
-rw-r--r-- | src/core/profile_io_data_qt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h index 4694ae350..b983b3a99 100644 --- a/src/core/profile_io_data_qt.h +++ b/src/core/profile_io_data_qt.h @@ -118,6 +118,8 @@ public: void updateHttpCache(); // runs on ui thread void updateJobFactory(); // runs on ui thread void updateRequestInterceptor(); // runs on ui thread + void requestStorageGeneration(); //runs on ui thread + void createProxyConfig(); //runs on ui thread void updateUsedForGlobalCertificateVerification(); // runs on ui thread bool hasPageInterceptors(); @@ -157,10 +159,7 @@ private: int m_httpCacheMaxSize = 0; bool m_initialized = false; bool m_updateAllStorage = false; - bool m_updateCookieStore = false; - bool m_updateHttpCache = false; bool m_updateJobFactory = false; - bool m_updateUserAgent = false; bool m_ignoreCertificateErrors = false; bool m_useForGlobalCertificateVerification = false; bool m_hasPageInterceptors = false; |