From d367ee08d1a07f1a30665b77ec11acec96e65a65 Mon Sep 17 00:00:00 2001
From: David Boddie <dboddie@trolltech.com>
Date: Tue, 9 Jun 2009 15:23:59 +0200
Subject: Doc: Fixed QWebPage::forwardUnsupportedContent documentation and
 added more information about Web plugins.

Reviewed-by: Trust Me
---
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp     |  8 +++++---
 src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 22 +++++++++++++++-------
 src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc   |  3 ++-
 3 files changed, 22 insertions(+), 11 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.
 */
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
index 1ad23f6..b516263 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
@@ -213,17 +213,25 @@ QWebSettings *QWebSettings::globalSettings()
     Each QWebPage object has its own QWebSettings object, which configures the
     settings for that page. If a setting is not configured, then it is looked
     up in the global settings object, which can be accessed using
-    QWebSettings::globalSettings().
+    globalSettings().
 
-    QWebSettings allows configuring font properties such as font size and font
-    family, the location of a custom stylesheet, and generic attributes like java
-    script, plugins, etc. The \l{QWebSettings::WebAttribute}{WebAttribute}
-    enum further describes this.
+    QWebSettings allows configuration of browser properties, such as font sizes and
+    families, the location of a custom style sheet, and generic attributes like
+    JavaScript and plugins. Individual attributes are set using the setAttribute()
+    function. The \l{QWebSettings::WebAttribute}{WebAttribute} enum further describes
+    each attribute.
 
-    QWebSettings also configures global properties such as the web page memory
-    cache and the web page icon database, local database storage and offline
+    QWebSettings also configures global properties such as the Web page memory
+    cache and the Web page icon database, local database storage and offline
     applications storage.
 
+    \section1 Enabling Plugins
+
+    Support for browser plugins can enabled by setting the
+    \l{QWebSettings::PluginsEnabled}{PluginsEnabled} attribute. For many applications,
+    this attribute is enabled for all pages by setting it on the
+    \l{globalSettings()}{global settings object}.
+
     \section1 Web Application Support
 
     WebKit provides support for features specified in \l{HTML 5} that improve the
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 06305e0..119c126 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -96,7 +96,8 @@
 
     Since WebKit supports the Netscape Plugin API, Qt applications can display
     Web pages that embed common plugins, as long as the user has the appropriate
-    binary files for those plugins installed.
+    binary files for those plugins installed and the \l{QWebSettings::PluginsEnabled}
+    attribute is set for the application.
 
     The following locations are searched for plugins:
 
-- 
cgit v0.12