diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-09-09 10:06:45 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-09-10 13:36:27 +0200 |
| commit | 2f96fb1beec5251e27381c09d0ad810c6e829c37 (patch) | |
| tree | 4e7cd85d7e1175657a0d91c1e0076ef156b71c68 /src/corelib | |
| parent | 162010441f876788428aaacf9a00312d3175d150 (diff) | |
Add an option to share between TLWs
Task-number: QTBUG-41191
Change-Id: I510d1631926ed0d9e371703d22229aed92432aa6
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 0da868602c..8437eb0469 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -527,6 +527,7 @@ public: AA_UseDesktopOpenGL = 15, AA_UseOpenGLES = 16, AA_UseSoftwareOpenGL = 17, + AA_ShareOpenGLContexts = 18, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index f6ea3a3a81..8dca48d80d 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -188,6 +188,11 @@ instance \l{Qt for Windows}, for more information. This value has been added in Qt 5.4. + \value AA_ShareOpenGLContexts Enables resource sharing between the OpenGL + contexts used by classes like QOpenGLWidget and QQuickWidget. This + allows sharing OpenGL resources, like textures, between QOpenGLWidget + instances that belong to different top-level windows. + The following values are obsolete: \value AA_ImmediateWidgetCreation This attribute is no longer fully |