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

Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00

4 files changed, 39 insertions, 26 deletions

diff --git a/src/webengine/doc/src/qtwebengine-index.qdoc b/src/webengine/doc/src/qtwebengine-index.qdoc
index 671425e75..e30976ef3 100644
--- a/src/webengine/doc/src/qtwebengine-index.qdoc
+++ b/src/webengine/doc/src/qtwebengine-index.qdoc
@@ -42,29 +42,6 @@
 
     \annotatedlist qtwebengine-qmlmodules
 
-    \section1 Getting Started
-
-    To include the definitions of the Qt WebEngineCore and Qt WebEngineWidgets modules' classes, use
-    the following directives:
-
-    \badcode
-    #include <QtWebEngineCore>
-    #include <QtWebEngineWidgets>
-    \endcode
-
-    To import the Qt WebEngine module's QML types, add the following import statement to your .qml
-    file:
-
-    \badcode
-    import QtWebEngine 1.2
-    \endcode
-
-    To link against the modules, add QT variables to your qmake .pro file:
-
-    \badcode
-    QT += webengine webenginecore webenginewidgets
-    \endcode
-
     \section1 Articles and Guides
 
     \list
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index cfe731c01..8be4adda0 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -140,7 +140,7 @@
     schemes. Requests for the scheme are then issued to QWebEngineUrlSchemeHandler::requestStarted()
     as QWebEngineUrlRequestJob objects.
 
-    The QWebEngineCookieStoreClient class provides functions for accessing HTTP cookies of Chromium.
+    The QWebEngineCookieStore class provides functions for accessing HTTP cookies of Chromium.
     The functions can be used to synchronize cookies with QNetworkAccessManager, as well as to set,
     delete, and intercept cookies during navigation.
 
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index fdaa4f861..0898a72fc 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -49,4 +49,34 @@
         \li Linux: Clang or GCC version 4.7 or later
         \li OS X: Xcode version 5.1 or later
     \endlist
+
+    \section1 Adobe Flash Player Plugin Support
+
+    Qt WebEngine supports the Adobe Flash player plugin that is a Pepper Plugin API (PPAPI)
+    plugin. The plugin must be installed in one of the following locations, depending on the
+    platform:
+
+    \list
+        \li Windows
+            \code
+            C:\Windows\SysWOW64\Macromed\Flash\pepflashplayer*.dll
+            C:\Windows\System32\Macromed\Flash\pepflashplayer*.dll
+            \endcode
+        \li OS X
+            \code
+            /Library/Internet Plug-Ins/PepperFlashPlayer/PepperFlashPlayer.plugin
+            \endcode
+        \li Linux
+            \code
+            /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so
+            /usr/lib/PepperFlash/libpepflashplayer.so
+            /usr/lib64/chromium/PepperFlash/libpepflashplayer.so
+            \endcode
+    \endlist
+
+    You can also load the Flash player from a specific location by using command line arguments:
+
+    \code
+    --ppapi-flash-path=./libpepflashplayer.so
+    \endcode
 */
diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
index e098071b3..89ff6f0b3 100644
--- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
+++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
@@ -33,7 +33,13 @@
     your .qml file:
 
     \badcode
-    import QtQuick 2.0
-    import QtWebEngine 1.1
+    import QtWebEngine 1.2
+    \endcode
+
+    To link against the module, add the following QT variable to your qmake .pro
+    file:
+
+    \badcode
+    QT += webengine
     \endcode
 */