From f6d21fb0e76e9a784f124ea1a082a83a689b1705 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Date: Mon, 24 Aug 2015 17:00:38 +0200
Subject: [PATCH] Doc: edit docs for QQuickWebEngineSettings
Add docs for missing PluginsEnabled value for
QWebEngineSettings::WebAttribute.
Change-Id: I368fff274609941d6435ddf3343b81bca6013945
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
src/webengine/api/qquickwebenginesettings.cpp | 8 ++++----
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 6a012ba39..0da01d69d 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -211,9 +211,9 @@ bool QQuickWebEngineSettings::errorPageEnabled() const
/*!
\qmlproperty bool WebEngineSettings::pluginsEnabled
- This setting enables general support for plugins.
+ Enables support for Pepper plugins, such as the Flash player.
- It is disabled by default.
+ Disabled by default.
*/
bool QQuickWebEngineSettings::pluginsEnabled() const
{
@@ -224,9 +224,9 @@ bool QQuickWebEngineSettings::pluginsEnabled() const
\qmlproperty bool WebEngineSettings::fullscreenSupportEnabled
\since QtWebEngine 1.2
- This setting tells the web engine if fullscreen is supported in this application or not.
+ Tells the web engine whether fullscreen is supported in this application or not.
- It is enabled by default.
+ Enabled by default.
*/
bool QQuickWebEngineSettings::fullscreenSupportEnabled() const
{
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index 521c08781..bb5217013 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -116,6 +116,8 @@
\value HyperlinkAuditingEnabled This setting enables support for the ping attribute for hyperlinks. It is disabled by default.
\value ScrollAnimatorEnabled This setting enables animated scrolling. It is disabled by default.
\value ErrorPageEnabled This setting enables built-in error pages of Chromium. It is enabled by default.
+ \value PluginsEnabled
+ Enables support for Pepper plugins, such as the Flash player. Disabled by default.
*/
/*!
--
GitLab