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

Change-Id: I604e6c2b88b1c1151aca3a85613085c45a5108a6

doc/src/platforms/supported-platforms.qdocinc

@@ -27,14 +27,14 @@
 
 /*!
 //! [embedded]
-\l {Qt for Embedded Linux}{Embedded Linux},
+\l {Qt for Embedded Linux}{Embedded Linux},
 \l {Windows CE - Introduction to using Qt}{Windows Embedded (Compact and Standard)},
 \l {QNX},
 VxWorks
 //! [embedded]
 
 //! [mobile]
-\l {Qt for Android}{Android},
+\l {Qt for Android}{Android},
 \l {Qt for iOS}{iOS},
 \l {Qt for WinRT}{WinRT}
 //! [mobile]

doc/src/qtmodules.qdoc

@@ -263,17 +263,8 @@
         \li \l[QtWebEngine]{Qt WebEngine}
         \li All
         \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
-        \li Provides a QML API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
-    \row
-        \li \l[QtWebEngineWidgets]{Qt WebEngine Widgets}
-        \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
-        \li Provides a C++ API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
-    \row
-        \li \l[QtWebEngineCore]{Qt WebEngine Core}
-        \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
-        \li Provides a public API shared by both \l[QtWebEngine]{Qt WebEngine} and \l[QtWebEngineWidgets]{Qt WebEngine Widgets}.
+        \li Classes and functions for embedding web content in applications using the
+            \l{http://www.chromium.org/Home}{Chromium browser project}.
     \row
         \li \l[QtWebSockets]{Qt WebSockets}
         \li All