summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/doc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-03 12:59:23 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-05 11:38:23 +0200
commit8f160af577e4d979954a63ab56f56e4d0c8ad0f8 (patch)
tree0c6cf366f3309c96e43e532527aff362320b7e94 /src/webenginewidgets/doc
parent601003362c75283e9164e997e3835e7c36c6db00 (diff)
parentfcdde728f0c4b4af5159b993e44eb6089d70aa90 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Diffstat (limited to 'src/webenginewidgets/doc')
-rw-r--r--src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc34
-rw-r--r--src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc6
2 files changed, 17 insertions, 23 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index bc841849e..26f3964da 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -24,12 +24,9 @@
/*!
\fn static QWebEngineSettings *QWebEngineSettings::globalSettings()
- Returns the global settings object.
+ \obsolete
- Any setting changed on the default object is automatically applied to all
- QWebEnginePage instances where the particular setting is not overridden already.
-
- \sa defaultSettings()
+ Use defaultSettings() instead.
*/
/*!
@@ -40,16 +37,15 @@
\inmodule QtWebEngineWidgets
- Each QWebEnginePage object has its own QWebEngineSettings object, which configures the
- settings for that page. If a setting is not configured, then it is looked
- up in the global settings object, which can be accessed using
- globalSettings().
-
QWebEngineSettings allows configuration of browser properties, such as font sizes and
families, the location of a custom style sheet, and generic attributes, such as JavaScript
support. Individual attributes are set using the setAttribute() function. The
\l{QWebEngineSettings::WebAttribute}{WebAttribute} enum further describes each attribute.
+ Each QWebEnginePage object has its own QWebEngineSettings object, which configures the
+ settings for that page. If a setting is not configured for a web engine
+ page, it is looked up in the settings of the profile the page belongs to.
+
\sa QWebEnginePage::settings(), QWebEngineView::settings()
*/
@@ -184,10 +180,8 @@
/*!
\fn void QWebEngineSettings::resetFontSize(FontSize type)
- Resets the font size for \a type to the size specified in the global
- settings object.
-
- This function has no effect on the global QWebEngineSettings instance.
+ Resets the font size for \a type to the size specified in the profile that
+ the page belongs to.
*/
/*!
@@ -222,10 +216,8 @@
/*!
\fn void QWebEngineSettings::resetFontFamily(FontFamily which)
- Resets the actual font family specified by \a which to the one set
- in the global QWebEngineSettings instance.
-
- This function has no effect on the global QWebEngineSettings instance.
+ Resets the actual font family specified by \a which to the one specified
+ in the profile that the page belongs to.
*/
/*!
@@ -245,9 +237,5 @@
\fn void QWebEngineSettings::resetAttribute(WebAttribute attribute)
Resets the setting of \a attribute to the value specified in the
- global QWebEngineSettings instance.
-
- This function has no effect on the global QWebEngineSettings instance.
-
- \sa globalSettings()
+ profile that the page belongs to.
*/
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index 3b27ca146..e54c5d507 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -141,6 +141,12 @@
\warning This function works only for HTML. For other MIME types (such as XHTML or SVG),
setContent() should be used instead.
+ \note Content larger than 2 MB cannot be displayed, because setHtml()
+ converts the provided HTML to percent-encoding and places \c data: in front
+ of it to create the URL that it navigates to. Thereby, the provided code
+ becomes a URL that exceeds the 2 MB limit set by Chromium. If the content is
+ too large, the loadFinished() signal is triggered with \c success=false.
+
\sa load(), setContent(), QWebEnginePage::toHtml(), QWebEnginePage::setContent()
*/