From 52d9eeab53b5cfd92c15c9a25894991f84cd827e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 12 Jan 2016 13:10:44 +0100 Subject: Doc: warn about heavy routines blocking content rendering Task-number: QTBUG-50092 Change-Id: I1f3bbcab3b1999b9ecc86660ff9fef8330775cb4 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/doc/src/webengineview.qdoc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/webengine/doc/src') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index bfdeab984..a8cd1eb56 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -251,6 +251,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. */ -- cgit v1.2.3 From d7cdbe5596bc51d7628d0f566730d4b2d09e462e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 20 Jan 2016 16:03:13 +0100 Subject: Document OS X 10.9 dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-48779 Change-Id: Iaf189f69a9c4434a9417d482e63b83d8fc2f58b1 Reviewed-by: Michael Brüning Reviewed-by: Leena Miettinen --- src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine/doc/src') diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 555db2a2d..3e30e9606 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 -- cgit v1.2.3 From ae4b0583e4d62b6fe660b316e8a9c117c8b85881 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 22 Jan 2016 16:45:09 +0100 Subject: Doc: rendering to OpenGL Surface Task-number: QTBUG-50037 Change-Id: I9c7a09824172a09d8b454bf8ff5d358c00ce6b88 Reviewed-by: Joerg Bornemann --- src/webengine/doc/src/webengineview.qdoc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/webengine/doc/src') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index a8cd1eb56..1d71a9cd9 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. */ /*! -- cgit v1.2.3