diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-11-28 08:15:12 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 17:06:51 (GMT) |
| commit | 3826203f744a2147bebf5f088de0d524156f59fd (patch) | |
| tree | e02da15a659c9ac7361f7b07faaec3c104c26a63 /src/3rdparty/webkit | |
| parent | 70170a1c32fc32832359fec14e1e1af7a1968fe9 (diff) | |
| download | Qt-3826203f744a2147bebf5f088de0d524156f59fd.zip Qt-3826203f744a2147bebf5f088de0d524156f59fd.tar.gz Qt-3826203f744a2147bebf5f088de0d524156f59fd.tar.bz2 | |
Various Qt documentation bug fixes (wk 42)
Task-number: QTBUG-18101
Task-number: QTBUG-8673
Task-number: QTBUG-14194
Task-number: QTBUG-9109
Task-number: QTBUG-9466
Task-number: QTBUG-8323
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-21295
Task-number: QTBUG-14554
Task-number: QTBUG-8331
Task-number: QTBUG-8329
Task-number: QTBUG-8786
Task-number: QTBUG-8787
Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp index 8f0f153..21e04ce 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp @@ -1668,7 +1668,7 @@ IntPoint QWebPagePrivate::TouchAdjuster::findCandidatePointForTouch(const IntPoi changes the behaviour to a case sensitive find operation. \value FindWrapsAroundDocument Makes findText() restart from the beginning of the document if the end was reached and the text was not found. - \value HighlightAllOccurrences Highlights all existing occurrences of a specific string. + \value HighlightAllOccurrences Highlights all existing occurrences of a specific string. (This value was introduced in 4.6.) */ /*! diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp index 9123ede..c1ef92e 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp @@ -434,11 +434,13 @@ QWebSettings* QWebSettings::globalSettings() web application cache feature is enabled or not. This is disabled by default. \value LocalStorageEnabled Specifies whether support for the HTML 5 local storage feature is enabled or not. This is disabled by default. + (This value was introduced in 4.6.) \value LocalStorageDatabaseEnabled \e{This enum value is deprecated.} Use QWebSettings::LocalStorageEnabled instead. \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls. This is disabled by default. For more information about security origins and local vs. remote content see QWebSecurityOrigin. + (This value was introduced in 4.6.) \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls. This is enabled by default. For more information about security origins and local vs. remote content see QWebSecurityOrigin. |