diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/webengine/doc/src/qtwebengine-platform-notes.qdoc | |
parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-platform-notes.qdoc')
-rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 10 |
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 |