diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
| commit | 7439343d169095a510d122ad7c69646a5946cdce (patch) | |
| tree | 8540b2bac1e495533585a645e216eaab66b06bd2 /src/webengine/api/qquickwebengineprofile.cpp | |
| parent | 3ecd61aea90cc4b283ffe9409cc10f5fd3476ecf (diff) | |
| parent | f8c132ffb7cd32d52bbfe09caa811665a3cb1069 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
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 32161570d..1ca97adea 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -288,7 +288,7 @@ QQuickWebEngineProfile::~QQuickWebEngineProfile() } /*! - \qmlproperty QString WebEngineProfile::storageName + \qmlproperty string WebEngineProfile::storageName The storage name that is used to create separate subdirectories for each profile that uses the disk for storing persistent data and cache. @@ -367,7 +367,7 @@ void QQuickWebEngineProfile::setOffTheRecord(bool offTheRecord) } /*! - \qmlproperty QString WebEngineProfile::persistentStoragePath + \qmlproperty string WebEngineProfile::persistentStoragePath The path to the location where the persistent data for the browser and web content are stored. Persistent data includes persistent cookies, HTML5 local storage, and visited links. @@ -404,7 +404,7 @@ void QQuickWebEngineProfile::setPersistentStoragePath(const QString &path) } /*! - \qmlproperty QString WebEngineProfile::cachePath + \qmlproperty string WebEngineProfile::cachePath The path to the location where the profile's caches are stored, in particular the HTTP cache. @@ -439,7 +439,7 @@ void QQuickWebEngineProfile::setCachePath(const QString &path) } /*! - \qmlproperty QString WebEngineProfile::httpUserAgent + \qmlproperty string WebEngineProfile::httpUserAgent The user-agent string sent with HTTP to identify the browser. */ @@ -574,7 +574,7 @@ void QQuickWebEngineProfile::setHttpCacheMaximumSize(int maximumSize) } /*! - \qmlproperty QString WebEngineProfile::httpAcceptLanguage + \qmlproperty string WebEngineProfile::httpAcceptLanguage The value of the Accept-Language HTTP request-header field. |