diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:36:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:36:42 +0200 |
| commit | 36feb681a97b3dd690a54d2eafd58081036992f1 (patch) | |
| tree | d9f908d943ebc545e4c5584a24cee47414cd4b0d /src/webengine/api/qquickwebengineprofile.cpp | |
| parent | 7d6c94db4c42339ca2948be802f2579ba5522f58 (diff) | |
| parent | ec84507898e58a167b185ba674acf300cc695380 (diff) | |
| download | qtwebengine-36feb681a97b3dd690a54d2eafd58081036992f1.tar.gz | |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I3e152ee134ed38628d1bf9571df58f469b29e74b
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 013696f7e..3af027b73 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -264,7 +264,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. @@ -343,7 +343,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. @@ -380,7 +380,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. @@ -415,7 +415,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. */ @@ -548,7 +548,7 @@ void QQuickWebEngineProfile::setHttpCacheMaximumSize(int maximumSize) } /*! - \qmlproperty QString WebEngineProfile::httpAcceptLanguage + \qmlproperty string WebEngineProfile::httpAcceptLanguage The value of the Accept-Language HTTP request-header field. |