diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-16 10:57:19 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-16 10:57:32 +0200 |
| commit | 94e39aff7dd02d4a631d5c40c6f5a5f6fa424035 (patch) | |
| tree | 7c68b7640835c1f4c681afb8acbacfdfc2a0fc32 /src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp | |
| parent | 6e8568ff784e093460e4383e32e064a49165c3a8 (diff) | |
| download | qt4-tools-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.gz | |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.6-staging ( 751940f0f1fb2599250632d7f0a3ead3930466af )
Changes in WebKit since the last update:
++ b/WebKit/qt/ChangeLog
2009-06-16 David Boddie <dboddie@trolltech.com>
Reviewed by Simon Hausmann.
Doc: Fixed QWebPage::forwardUnsupportedContent documentation and added
more information about Web plugins.
* Api/qwebpage.cpp:
* Api/qwebsettings.cpp:
* docs/qtwebkit.qdoc:
2009-06-16 Morten Engvoldsen <morten.engvoldsen@nokia.com>
Reviewed by Ariya Hidayat.
Clearifying QWebFrame docs
Adding docs to toHtml() and toPlainText()
* Api/qwebframe.cpp:
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp')
| -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 db4bfecdc2..cedd8aeb08 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp @@ -360,7 +360,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() */ @@ -372,7 +372,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() */ |