diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 21:04:41 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 21:04:41 (GMT) |
| commit | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (patch) | |
| tree | 2cdd417bc0be39b12674f33052462d19d9e38ef9 /src/3rdparty/webkit | |
| parent | 7b1f8c542bc9f41408f0a54b853d75d0c09a2775 (diff) | |
| parent | d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b (diff) | |
| download | Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.zip Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.gz Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qtreeview/tst_qtreeview.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() */ |