summaryrefslogtreecommitdiffstats
path: root/src/webengine/api
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-09-27 09:44:15 +0200
committerLiang Qi <liang.qi@qt.io>2018-09-27 10:17:04 +0200
commit95baba26936cdabe5cf4d5eaa4d59f97e4a2102d (patch)
tree5fd4c75167a5a040bb34aeec54d5e8ef2a06f137 /src/webengine/api
parent32b67aea15fdf47d6b86e1e5303d25ec6e8ded37 (diff)
parentdd7c3f92c4668ed9ebdb1714d00de1cb61ab7dd4 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: configure.json configure.pri src/3rdparty Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
Diffstat (limited to 'src/webengine/api')
-rw-r--r--src/webengine/api/qquickwebengineprofile.cpp36
1 files changed, 29 insertions, 7 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index f536695ef..ed2600e49 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -69,11 +69,18 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineDownloadItem::MimeHtmlSaveFormat, QtWebEngineC
\inmodule QtWebEngine
- A web engine profile contains properties and functionality shared by a group of web engine
- pages.
-
- Information about visited links is stored together with persistent cookies and other persistent
- data in a storage described by the persistentStoragePath property.
+ A web engine profile contains settings, scripts, persistent cookie policy, and the list of
+ visited links shared by all web engine pages that belong to the profile.
+
+ Information about visited links is stored together with persistent cookies
+ and other persistent data in a storage determined by the storageName
+ property. Persistent data is stored in a subdirectory determined by the
+ persistentStoragePath property and the cache in a subdirectory determined by
+ the cachePath property. The httpCacheType property describes the type of the
+ cache: \e in-memory or \e on-disk. If only the storageName property is set,
+ the other values are generated automatically based on it. If you specify
+ any of the values manually, you should do it before creating any pages that
+ belong to the profile.
Profiles can be used to isolate pages from each other. A typical use case is a dedicated
\e {off-the-record profile} for a \e {private browsing} mode. An off-the-record profile forces
@@ -310,8 +317,23 @@ void QQuickWebEngineProfilePrivate::userScripts_clear(QQmlListProperty<QQuickWeb
\brief Contains settings, scripts, and visited links common to multiple web engine views.
WebEngineProfile contains settings, scripts, and the list of visited links shared by all
- views that belong to the profile. As such, profiles can be used to isolate views
- from each other. A typical use case is a dedicated profile for a 'private browsing' mode.
+ views that belong to the profile.
+
+ Information about visited links is stored together with persistent cookies
+ and other persistent data in a storage determined by the storageName
+ property. Persistent data is stored in a subdirectory determined by the
+ persistentStoragePath property and the cache in a subdirectory determined by
+ the cachePath property. The httpCacheType property describes the type of the
+ cache: \e in-memory or \e on-disk. If only the storageName property is set,
+ the other values are generated automatically based on it. If you specify
+ any of the values manually, you should do it before creating any pages that
+ belong to the profile.
+
+ Profiles can be used to isolate pages from each other. A typical use case is
+ a dedicated \e {off-the-record profile} for a \e {private browsing} mode. An
+ off-the-record profile forces cookies, the HTTP cache, and other normally
+ persistent data to be stored only in memory. The offTheRecord property holds
+ whether a profile is off-the-record.
Each web engine view has an associated profile. Views that do not have a specific profile set
share a common default one.