diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-04-01 12:34:58 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-03 10:32:42 +0000 |
| commit | 004205323497bc50674133aa3c915d9284ccd266 (patch) | |
| tree | f5075469ffa2d022da77377120c3dcfdeb01cb77 /src | |
| parent | cc73ff24cb45e9b81c9f4ecb9174f19ef17fcb73 (diff) | |
Doc: Link Pepper plugin platform information to respective settings
Change-Id: I1bd0c58a0cee3933370238841c12cf0c1d965c93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 10 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index fe421993a..58d2b681d 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -213,6 +213,8 @@ bool QQuickWebEngineSettings::errorPageEnabled() const Enables support for Pepper plugins, such as the Flash player. Disabled by default. + + \sa {Pepper Plugin API Support} */ bool QQuickWebEngineSettings::pluginsEnabled() const { diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index e37817e0e..64bfba054 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 diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 5b9d75314..04fbff925 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -127,7 +127,8 @@ \value ErrorPageEnabled Enables displaying the built-in error pages of Chromium. Enabled by default. \value PluginsEnabled - Enables support for Pepper plugins, such as the Flash player. Disabled by default. (Added in Qt 5.6) + Enables support for Pepper plugins, such as the Flash player. Disabled by default. + See also \l{Pepper Plugin API Support}. (Added in Qt 5.6) \value FullScreenSupportEnabled Enables fullscreen support in an application. Disabled by default. (Added in Qt 5.6) */ |