diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-06-10 22:40:02 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-06-10 22:40:02 (GMT) |
| commit | d911206aed44fa3839132d2bf62b2ba21bd93a72 (patch) | |
| tree | 025e7c3498fe770ea557dd2fdc9d905bb9f0d5bb /src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | |
| parent | df4763878d756fe1f5bcfe6b7dd8cf91cdd091e1 (diff) | |
| parent | 9ba808cf3fa6118822b7fc9ed9f8f2d0ce2218c3 (diff) | |
| download | Qt-d911206aed44fa3839132d2bf62b2ba21bd93a72.zip Qt-d911206aed44fa3839132d2bf62b2ba21bd93a72.tar.gz Qt-d911206aed44fa3839132d2bf62b2ba21bd93a72.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 01b68eb..77add54 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1986,10 +1986,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. */ |