From ba8d31f5513b486add0ffc84836a4062bedf234a Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 8 Feb 2018 11:23:21 +0100
Subject: [PATCH] Allow disabling cache of off-the-record profiles
Change-Id: Ib319f46465e9f330ef5f2c7a5b2f6a3d50c33c00
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/browser_context_adapter.cpp | 2 ++
src/webengine/api/qquickwebengineprofile.cpp | 7 ++++---
src/webenginewidgets/api/qwebengineprofile.cpp | 8 +++++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index 7e9a4e41d..404cfc575 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -334,6 +334,8 @@ void BrowserContextAdapter::setHttpUserAgent(const QString &userAgent)
BrowserContextAdapter::HttpCacheType BrowserContextAdapter::httpCacheType() const
{
+ if (m_httpCacheType == NoCache)
+ return NoCache;
if (isOffTheRecord() || httpCachePath().isEmpty())
return MemoryHttpCache;
return m_httpCacheType;
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 728f0b4a4..17c9738fb 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -98,9 +98,10 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineDownloadItem::MimeHtmlSaveFormat, QtWebEngineC
This enum describes the HTTP cache type:
- \value MemoryHttpCache Use an in-memory cache. This is the only setting possible if
- \c off-the-record is set or no cache path is available.
- \value DiskHttpCache Use a disk cache. This is the default.
+ \value MemoryHttpCache Use an in-memory cache. This is the default if
+ \c off-the-record is set.
+ \value DiskHttpCache Use a disk cache. This is the default if \c off-the-record
+ is not set. Falls back to \c MemoryHttpCache if \c off-the-record is set.
\value NoCache Disable both in-memory and disk caching. (Added in Qt 5.7)
*/
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index cf4e0f41c..a619a10c3 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -109,9 +109,11 @@ using QtWebEngineCore::BrowserContextAdapter;
This enum describes the HTTP cache type:
- \value MemoryHttpCache Use an in-memory cache. This is the only setting possible if
- \c off-the-record is set or no cache path is available.
- \value DiskHttpCache Use a disk cache. This is the default.
+ \value MemoryHttpCache Use an in-memory cache. This is the default if
+ \c off-the-record is set.
+ \value DiskHttpCache Use a disk cache. This is the default if the profile
+ is not \c off-the-record. If set on an \c off-the-record profile will instead
+ set \c MemoryHttpCache.
\value NoCache Disable both in-memory and disk caching. (Added in Qt 5.7)
*/
--
GitLab