diff options
| -rw-r--r-- | src/core/browser_context_adapter.cpp | 2 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 3 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 7 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineprofile.cpp | 8 |
4 files changed, 13 insertions, 7 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/core/config/linux.pri b/src/core/config/linux.pri index f3103e749..daac6fa31 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -19,7 +19,8 @@ clang { gn_args += \ is_clang=true \ clang_use_chrome_plugins=false \ - clang_base_path=\"$${clang_prefix}\" + clang_base_path=\"$${clang_prefix}\" \ + use_lld=false linux-clang-libc++: gn_args += use_libcxx=true } else { 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) */ |