diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-10 04:45:49 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-10 04:45:49 (GMT) |
commit | c72354d2e55c93bfb92c59319dda1496e8c998a3 (patch) | |
tree | 193bd5963c00af87ff2e5104065f1b7deee67ba3 /src/3rdparty/webkit | |
parent | 53a3705d2498a69389a06444290b699a2d9dc7f3 (diff) | |
parent | df4033a1f7ef0786fba6d4d2027e38a2fffd1e27 (diff) | |
download | Qt-c72354d2e55c93bfb92c59319dda1496e8c998a3.zip Qt-c72354d2e55c93bfb92c59319dda1496e8c998a3.tar.gz Qt-c72354d2e55c93bfb92c59319dda1496e8c998a3.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index 06305e0..6ad2183 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -94,14 +94,18 @@ \section1 Netscape Plugin Support + \note Netscape plugin support is only available on desktop platforms. + 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. + Web pages that embed common plugins on platforms for which those plugins + are available. To enable plugin support, the user must have the appropriate + binary files for those plugins installed and the \l{QWebSettings::PluginsEnabled} + attribute must be enabled for the application. The following locations are searched for plugins: \table - \header \o Linux/Unix \o Windows + \header \o Linux/Unix (X11) \o Windows \row \o{1,3} \list \o \c{.mozilla/plugins} in the user's home directory |