summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/api/qwebengineprofile.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-11 10:01:36 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-11 10:53:06 +0200
commit7978feadee937299798372bced1680f52b4b1842 (patch)
treebb844daade8c195c0a963f4663c2a0f880bd840a /src/webenginewidgets/api/qwebengineprofile.cpp
parent56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff)
parent56955e73d4be21bc3f086d1c805352a96944a25c (diff)
Merge branch '5.6' into 5.7
Diffstat (limited to 'src/webenginewidgets/api/qwebengineprofile.cpp')
-rw-r--r--src/webenginewidgets/api/qwebengineprofile.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 22495ee2e..22d4d088f 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -470,7 +470,9 @@ void QWebEngineProfile::setHttpCacheMaximumSize(int maxSize)
}
/*!
- Returns the cookie store singleton, if one has been set.
+ Returns the cookie store for this profile.
+
+ \since 5.6
*/
QWebEngineCookieStore* QWebEngineProfile::cookieStore()
@@ -485,6 +487,7 @@ QWebEngineCookieStore* QWebEngineProfile::cookieStore()
The profile does not take ownership of the pointer.
+ \since 5.6
\sa QWebEngineUrlRequestInfo
*/