Merge remote-tracking branch 'origin/5.6' into 5.7.0

Conflicts:
	src/3rdparty
	src/core/browser_context_adapter.cpp
	src/core/web_contents_adapter.cpp
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I768fc954a9a2147fc3669961286163a0a824def3

3 files changed, 15 insertions, 4 deletions

diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 6f41c81fd..a6cb0a384 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -39,7 +39,8 @@
     and findText().
 
     A page can be loaded using load() or setUrl(). Alternatively, if you have
-    the HTML content readily available, you can use setHtml().
+    the HTML content readily available, you can use setHtml(). The GET method is
+    always used to load URLs.
 
     The QWebEnginePage class also offers methods to retrieve both the URL currently
     loaded by the page (see url()) as well as the URL originally requested
@@ -615,6 +616,10 @@
     \warning This function works only for HTML, for other mime types (such as XHTML and SVG)
     setContent() should be used instead.
 
+    \warning The content will be percent encoded before being sent to the renderer via IPC.
+    This may increase its size. The maximum size of the percent encoded content is
+    2 megabytes minus 30 bytes.
+
     \sa toHtml(), setContent(), load()
 */
 
@@ -630,6 +635,10 @@
 
     \note This method will not affect session or global history for the page.
 
+    \warning The content will be percent encoded before being sent to the renderer via IPC.
+    This may increase its size. The maximum size of the percent encoded content is
+    2 megabytes minus 6 bytes plus the length of the mime type string.
+
     \sa toHtml(), setHtml()
 */
 
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index 3e0f4cf82..c2f810b2a 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -130,7 +130,7 @@
             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)
+            See also \l{Pepper Plugin API}. (Added in Qt 5.6)
     \value  FullScreenSupportEnabled
             Enables fullscreen support in an application. Disabled by default. (Added in Qt 5.6)
     \value  ScreenCaptureEnabled
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index feaa802d7..5a4c1b52b 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -37,8 +37,10 @@
     It can be used in various applications to display web content live from the
     Internet.
 
-    A \e {web site} can be loaded to a web view with the load() function. Like all
-    Qt widgets, the show() function must be invoked in order to display
+    A \e {web site} can be loaded to a web view with the load() function. The
+    GET method is always used to load URLs.
+
+    Like all Qt widgets, the show() function must be invoked in order to display
     the web view. The snippet below illustrates this:
 
     \snippet simple/main.cpp Using QWebEngineView