summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-06-10 22:40:02 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-06-10 22:40:02 (GMT)
commitd911206aed44fa3839132d2bf62b2ba21bd93a72 (patch)
tree025e7c3498fe770ea557dd2fdc9d905bb9f0d5bb /src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
parentdf4763878d756fe1f5bcfe6b7dd8cf91cdd091e1 (diff)
parent9ba808cf3fa6118822b7fc9ed9f8f2d0ce2218c3 (diff)
downloadQt-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/docs/qtwebkit.qdoc')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc3
1 files changed, 2 insertions, 1 deletions
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: