diff options
| author | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
| commit | 04fc98f2ed323c71a8671542f4f37faa988c434f (patch) | |
| tree | 11a5dc618d6dfc27d8aafe3bf3a28981325a7304 /src/3rdparty | |
| parent | 3d4a2cd013f9e62788adf902a57ae8e2f31fccc7 (diff) | |
| parent | 92789fabd6728820b244d23d7477f2a224a33f94 (diff) | |
| download | Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.zip Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.gz Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index e3c904b..09dfae5 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -139,15 +139,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 + 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 is enabled for the application. + 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 |