diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-03 12:00:22 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-03 12:00:22 (GMT) |
| commit | c5845e6ea9cafea836038e24e6072aaed8242ef1 (patch) | |
| tree | b361ec57fa22c38d509bb177fe323140dade5219 /src/3rdparty/webkit | |
| parent | b2d43b06d1c1debcd42afbc7dfd85c4991c670d5 (diff) | |
| parent | 3d05a836cb0bc62e6dc31d297bada07ec60adc34 (diff) | |
| download | Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.zip Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.tar.gz Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/kernel/qapplication_s60.cpp
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() */ |