Merge remote-tracking branch 'origin/5.11.2' into 5.11

Change-Id: Idee34fa6d4cc54effd84d3b78e3666fa7fcce8db

6 files changed, 9 insertions, 6 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject 82740520c942c91f596ee53ff3ca09ac4e49489
+Subproject 7085115f51ce9d02cfff216a3f74b1fb6715f38
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 62d62119a..48e5bc438 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -186,7 +186,7 @@ bool usingSoftwareDynamicGL()
 {
     if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL))
         return true;
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) && !defined(QT_NO_OPENGL)
     HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
     wchar_t path[MAX_PATH];
     DWORD size = GetModuleFileName(handle, path, MAX_PATH);
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index acc5cedb7..ab7aee4cb 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -86,7 +86,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \enum QQuickWebEngineScript::ScriptWorldId
 
-    The world ID defining which isolated world the script is executed in.
+    The world ID defining which isolated world the script is executed in. Besides these predefined
+    IDs custom IDs can be used, but must be integers between \c 0 and \c 256.
 
     \value MainWorld
            The world used by the page's web contents. It can be useful in order to expose custom
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index a6a7c088b..c089538b1 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -365,7 +365,7 @@
     \since QtWebEngine 1.3
 
     JavaScript world that the web channel instance used by this view is
-    installed in.
+    installed in. The world must be a number between \c 0 and \c 256.
 */
 
 /*!
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp
index d5247cde1..d1e996b3a 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -224,6 +224,8 @@ quint32 QWebEngineScript::worldId() const
 
 /*!
     Sets the world ID of the isolated world to \a id when running this script.
+
+    Must be between \c 0 and \c 256.
  */
 void QWebEngineScript::setWorldId(quint32 id)
 {
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 3013903c8..f91b71ea1 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -718,9 +718,9 @@
     \since 5.7
 
     Runs the JavaScript code contained in \a scriptSource in the world specified by \a worldId.
-    The world ID values are the same as provided by QWebEngineScript::ScriptWorldId. Using the
-    \e runJavaScript() versions without the world ID is the same as running the script in the
-    \c MainWorld.
+    The world ID values are the same as provided by QWebEngineScript::ScriptWorldId, and between \c 0
+    and \c 256. Using the \e runJavaScript() versions without the world ID is the same as running the
+    script in the \c MainWorld.
 
     When the script has been executed, \a resultCallback is called with the result of the last
     executed statement. \c resultCallback can be any of a function pointer, a functor or a lambda,