diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-02 08:15:43 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-02 08:15:43 (GMT) |
| commit | c675a782cbc528fd691c881e0c63e9aa9319bf68 (patch) | |
| tree | d90b1ca71a2dc528a633c23ab88d86c8aac899b5 /src/3rdparty/webkit | |
| parent | da15aca8f065df59e47748b48f427a77505c5a61 (diff) | |
| parent | 3c594257c4aedf113de92c5888e74f676ba87385 (diff) | |
| download | Qt-c675a782cbc528fd691c881e0c63e9aa9319bf68.zip Qt-c675a782cbc528fd691c881e0c63e9aa9319bf68.tar.gz Qt-c675a782cbc528fd691c881e0c63e9aa9319bf68.tar.bz2 | |
Merge branch 'master' of git@scm.dev.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() */ |