diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/webengine/api/qtwebengineglobal.cpp | |
parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/webengine/api/qtwebengineglobal.cpp')
-rw-r--r-- | src/webengine/api/qtwebengineglobal.cpp | 5 |
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() { |