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/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | |
| parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
| parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 5750d05f1..cb75c69fa 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -130,8 +130,9 @@ 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. + See also \l{Pepper Plugin API Support}. (Added in Qt 5.6) \value FullScreenSupportEnabled - Enables fullscreen support in an application. Disabled by default. + Enables fullscreen support in an application. Disabled by default. (Added in Qt 5.6) \value ScreenCaptureEnabled Enables screen capture in an application. Disabled by default. (Added in Qt 5.7) \value WebGLEnabled |