diff options
| author | Iain <qt-info@nokia.com> | 2009-06-04 15:23:03 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-06-04 15:23:03 (GMT) |
| commit | aa081e40af9f3dd7b7e9a47e062f7784e0dbb515 (patch) | |
| tree | 795ebd361f31956ac7ab5f8b850ec51ed7338dd0 /src/3rdparty/webkit | |
| parent | 2b6dda723b168b3379684bc89b128ea1e792eddf (diff) | |
| parent | 422905e301394dfd23b59a09ac9a725803ddf4e4 (diff) | |
| download | Qt-aa081e40af9f3dd7b7e9a47e062f7784e0dbb515.zip Qt-aa081e40af9f3dd7b7e9a47e062f7784e0dbb515.tar.gz Qt-aa081e40af9f3dd7b7e9a47e062f7784e0dbb515.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp index 5dc6363..e565476 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp @@ -268,7 +268,7 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object } /*! - Returns the frame's content, converted to HTML. + Returns the frame's content as HTML, enclosed in HTML and BODY tags. \sa setHtml(), toPlainText() */ @@ -280,7 +280,8 @@ QString QWebFrame::toHtml() const } /*! - Returns the content of this frame converted to plain text. + Returns the content of this frame converted to plain text, completely + stripped of all HTML formatting. \sa toHtml() */ |