diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
| commit | 1a3b34ea8cfb09dcb9022e897c4b494b623abd6a (patch) | |
| tree | b18be3e29e8ce191a99641985baa371a5d504682 /src/webengine/api/qtwebengineglobal.cpp | |
| parent | 1a0e71b130f55a3ce77c6b27ac898355253f1b9a (diff) | |
| parent | 2b953bf803aa74f4c6e1e3f06b22887c1ac80961 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
Diffstat (limited to 'src/webengine/api/qtwebengineglobal.cpp')
| -rw-r--r-- | src/webengine/api/qtwebengineglobal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp index 801052782..a242fc6aa 100644 --- a/src/webengine/api/qtwebengineglobal.cpp +++ b/src/webengine/api/qtwebengineglobal.cpp @@ -62,7 +62,7 @@ namespace QtWebEngine { /*! \fn QtWebEngine::initialize() - Sets up an OpenGL Context that can be shared between processes. This has to be done after + Sets up an OpenGL Context that can be shared between threads. This has to be done after QGuiApplication is created, but before a Qt Quick window is created. This has the same effect as setting the Qt::AA_ShareOpenGLContexts |