summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qtwebengineglobal.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-11 09:05:49 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-04-11 15:33:49 +0000
commit22a550303618202135e58f5673e7b8935d578687 (patch)
tree560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/webengine/api/qtwebengineglobal.cpp
parentf8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff)
parent7978feadee937299798372bced1680f52b4b1842 (diff)
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'src/webengine/api/qtwebengineglobal.cpp')
-rw-r--r--src/webengine/api/qtwebengineglobal.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp
index 6cd13ad5f..801052782 100644
--- a/src/webengine/api/qtwebengineglobal.cpp
+++ b/src/webengine/api/qtwebengineglobal.cpp
@@ -65,8 +65,9 @@ namespace QtWebEngine {
Sets up an OpenGL Context that can be shared between processes. This has to be done after
QGuiApplication is created, but before a Qt Quick window is created.
- This has the same effect as passing Qt::AA_ShareOpenGLContexts to the QGuiApplication
- constructor.
+ This has the same effect as setting the Qt::AA_ShareOpenGLContexts
+ attribute with QCoreApplication::setAttribute before constructing
+ QGuiApplication.
*/
void initialize()
{