Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	.qmake.conf
	src/webenginewidgets/api/qwebenginepage.cpp

Change-Id: Idb33c92bd53fab76eee8fedb542dbf5e4a10f9e6

1 files changed, 8 insertions, 9 deletions

diff --git a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
index 9b7de27e2..ed1f1a773 100644
--- a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
+++ b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
@@ -99,17 +99,16 @@
 
     \section1 Architecture
 
-    The easiest way to render content is through the QWebEngineView class. As a
-    widget it can be embedded into your forms and it provides convenience functions
-    for downloading and rendering web sites.
+    Use the QWebEngineView class to display web pages in the simplest way.
+    Because it's a widget, you can embed QWebEngineView into your forms and use
+    its convenience functions to download and display web sites.
 
     \snippet snippets/simple/main.cpp Using QWebEngineView
 
-    QWebEngineView is used to view Web pages. An instance of QWebEngineView has one
-    QWebEnginePage. QWebEnginePage provides access to the page's navigation history,
-    allows to run JavaScript code in the context of the page's main frame and enables
-    customization of handlers for specific events such as showing custom authentication
-    dialogs.
+    An instance of QWebEngineView has one QWebEnginePage. QWebEnginePage
+    provides access to the page's navigation history, ability to run JavaScript
+    code in the context of the page's main frame, and enables customization of
+    handlers for specific events like showing custom authentication dialogs.
 
     \section1 Reference Documentation
 
@@ -131,7 +130,7 @@
     GNU Library General Public License (LGPLv2).
 
     Developers using the Open Source Edition can choose to redistribute
-    the module under the GNU LGPLv3.
+    the module under the GNU LGPLv3 or GPLv2 and up.
 
     \legalese