diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-16 08:57:19 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-16 08:57:32 (GMT) |
| commit | 94e39aff7dd02d4a631d5c40c6f5a5f6fa424035 (patch) | |
| tree | 7c68b7640835c1f4c681afb8acbacfdfc2a0fc32 /src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | |
| parent | 6e8568ff784e093460e4383e32e064a49165c3a8 (diff) | |
| download | Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.zip Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.gz Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.bz2 | |
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/qwebpage.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index ee64cad..dc0eebd 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -2139,10 +2139,12 @@ bool QWebPage::isContentEditable() const /*! \property QWebPage::forwardUnsupportedContent - \brief whether QWebPage should forward unsupported content through the - unsupportedContent signal + \brief whether QWebPage should forward unsupported content - If disabled the download of such content is aborted immediately. + If enabled, the unsupportedContent() signal is emitted with a network reply that + can be used to read the content. + + If disabled, the download of such content is aborted immediately. By default unsupported content is not forwarded. */ |