diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-30 15:45:50 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-30 16:17:37 +0100 |
commit | 4cf520d67f0619330bbf53a743818924d476d95f (patch) | |
tree | 58e13e6747affa06bf495c25c8dc7e272a428ba3 /src/core/profile_io_data_qt.h | |
parent | 21f10e777ee2faf41196d0263d4e5134d0ec216a (diff) | |
parent | 91fc86bef3b9eb9467f6ac251d1953483da93185 (diff) |
Merge branch '5.13' into 5.14
Change-Id: I6ab2e949cb2fa3b2db55a1654d42667db6257eab
Diffstat (limited to 'src/core/profile_io_data_qt.h')
-rw-r--r-- | src/core/profile_io_data_qt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h index 8f11a9ce2..ec0a3dac9 100644 --- a/src/core/profile_io_data_qt.h +++ b/src/core/profile_io_data_qt.h @@ -130,7 +130,8 @@ public: void setGlobalCertificateVerification(); // Used in NetworkDelegateQt::OnBeforeURLRequest. - QWebEngineUrlRequestInterceptor *acquireInterceptor(); + bool isInterceptorDeprecated() const; // Remove for Qt6 + QWebEngineUrlRequestInterceptor *acquireInterceptor(); // Remove for Qt6 void releaseInterceptor(); QWebEngineUrlRequestInterceptor *requestInterceptor(); @@ -220,6 +221,7 @@ private: base::WeakPtrFactory<ProfileIODataQt> m_weakPtrFactory; // this should be always the last member QString m_dataPath; bool m_pendingStorageRequestGeneration = false; + volatile bool m_isInterceptorDeprecated = false; // Remove for Qt6 DISALLOW_COPY_AND_ASSIGN(ProfileIODataQt); friend class BrowsingDataRemoverObserverQt; |