summaryrefslogtreecommitdiffstats
path: root/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-11 09:05:49 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-04-11 15:33:49 +0000
commit22a550303618202135e58f5673e7b8935d578687 (patch)
tree560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/webengine/doc/src/qtwebengine-platform-notes.qdoc
parentf8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff)
parent7978feadee937299798372bced1680f52b4b1842 (diff)
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-platform-notes.qdoc')
-rw-r--r--src/webengine/doc/src/qtwebengine-platform-notes.qdoc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 5a81c7775..c5f373029 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -68,8 +68,12 @@
\section1 Pepper Plugin API Support
- Qt WebEngine supports loading Pepper Plugin API (PPAPI) plugins. The plugins must be loaded
- manually using the Chromium command line syntax with the \c --register-pepper-plugins argument.
+ Qt WebEngine supports loading Pepper Plugin API (PPAPI) plugins if
+ WebEngineSettings::pluginsEnabled or QWebEngineSettings::PluginsEnabled
+ is set.
+
+ Except for the Adobe Flash Player plugin, the plugins must be loaded manually using the
+ Chromium command line syntax with the \c --register-pepper-plugins argument.
The argument value is a list of entries, separated by commas, that contain the file path and
one or several MIME types, separated by semicolons:
@@ -85,8 +89,6 @@
The MIME type is important because it determines which embeds the plugin is used for.
- This process has been automated for the Pepper Flash player plugin.
-
\section2 Pepper Flash Player Plugin Support
The Pepper Flash player plugin can be loaded automatically if it is installed in one of the