Merge branch '5.6' into dev

Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0

2 files changed, 20 insertions, 1 deletions

diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 55f6c5504..29b8db42e 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -47,7 +47,7 @@
     \list
         \li Windows: Visual Studio 2013 or Visual Studio 2015
         \li Linux: Clang or GCC version 4.7 or later
-        \li OS X: Xcode version 5.1 or later
+        \li OS X: Xcode version 5.1 or later on OS X 10.9 or later
     \endlist
 
     \section1 Pepper Plugin API Support
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 39441228d..a242acffc 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -29,6 +29,22 @@
     \inqmlmodule QtWebEngine
     \since QtWebEngine 1.0
     \brief A WebEngineView renders web content within a QML application.
+
+    The WebEngineView type enables QML applications to render regions of dynamic web content. It
+    may share the screen with other QML types, such as a TabView, or fill the screen, as specified
+    within the QML application.
+
+    \section1 Rendering to OpenGL Surface
+
+    When using a QQuickRenderControl to render a Qt Quick user interface to an OpenGL surface, the
+    WebEngineView type is not rendered correctly. The web engine view attempts to use a global
+    OpenGL context created by \l QtWebEngine::initialize(), but there is no public API for accessing
+    that context in order to share it with the \c QQuickRenderControl context.
+
+    To have the web engine view rendered correctly, it is possible to manually create a new
+    offscreen context that is shared with the \c QQuickRenderControl and to call the non-public
+    function \c qt_gl_set_global_share_context(), rather than calling \c initialize().
+    If \c initialize() is called after setting a global context, it will do nothing.
 */
 
 /*!
@@ -251,6 +267,9 @@
     The script will run in the same \e world as other scripts that are
     part of the loaded site.
 
+    \warning Do not execute lengthy routines in the callback function, because it might block the
+    rendering of the web content.
+
     See WebEngineView::userScripts for an alternative API to inject scripts.
 */