diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
commit | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (patch) | |
tree | 57afb359e42aa922c4ca31666aab1ee7d49c9212 /src/webengine/api/qquickwebengineprofile.cpp | |
parent | 765f9c6630afcd9d022e30ffdbe909fbf1ea9549 (diff) | |
parent | b7fde78d7822ed7f2221acfd9db15b3ff579e29d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
Diffstat (limited to 'src/webengine/api/qquickwebengineprofile.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index 2f8188c9d..191105e52 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -466,10 +466,10 @@ void QQuickWebEngineProfile::setHttpUserAgent(const QString &userAgent) This enumeration describes the type of the HTTP cache: - \value MemoryHttpCache + \value WebEngineProfile.MemoryHttpCache Uses an in-memory cache. This is the only setting possible if offTheRecord is set or no persistentStoragePath is available. - \value DiskHttpCache + \value WebEngineProfile.DiskHttpCache Uses a disk cache. This is the default value. \value WebEngineProfile.NoCache Disables caching. (Added in 5.7) @@ -503,13 +503,13 @@ void QQuickWebEngineProfile::setHttpCacheType(QQuickWebEngineProfile::HttpCacheT This enumeration describes the policy of cookie persistency: - \value NoPersistentCookies + \value WebEngineProfile.NoPersistentCookies Both session and persistent cookies are stored in memory. This is the only setting possible if offTheRecord is set or no persistentStoragePath is available. - \value AllowPersistentCookies + \value WebEngineProfile.AllowPersistentCookies Cookies marked persistent are saved to and restored from disk, whereas session cookies are only stored to disk for crash recovery. This is the default setting. - \value ForcePersistentCookies + \value WebEngineProfile.ForcePersistentCookies Both session and persistent cookies are saved to and restored from disk. */ |