diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 839d352d36..3ec859dbb7 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -521,6 +521,7 @@ public: AA_ForceRasterWidgets = 14, AA_UseDesktopOpenGL = 15, AA_UseOpenGLES = 16, + AA_UseSoftwareOpenGL = 17, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 8ade3f86d6..873c1bf0cc 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -168,14 +168,26 @@ \value AA_ForceRasterWidgets Make top-level widgets use pure raster surfaces, and do not support non-native GL-based child widgets. - \value AA_UseDesktopOpenGL Forces the usage of the desktop OpenGL on - platforms that use dynamic loading of the OpenGL implementation. + \value AA_UseDesktopOpenGL Forces the usage of desktop OpenGL (for example, + \e opengl32.dll or \e libGL.so) on platforms that use dynamic loading + of the OpenGL implementation. This value has been added in Qt 5.3. - \value AA_UseOpenGLES Forces the usage of OpenGL ES 2.0 on platforms that - use dynamic loading of the OpenGL implementation. + \value AA_UseOpenGLES Forces the usage of OpenGL ES 2.0 or higher on + platforms that use dynamic loading of the OpenGL implementation. This value has been added in Qt 5.3. + \value AA_UseSoftwareOpenGL Forces the usage of a software based OpenGL + implementation on platforms that use dynamic loading of the OpenGL + implementation. This will typically be a patched build of + \l{http://www.mesa3d.org/llvmpipe.html}{Mesa llvmpipe}, providing + OpenGL 2.1. The value may have no effect if no such OpenGL + implementation is available. The default name of this library is + QtSoftwareOpenGL.dll and can be overridden by setting the environment + variable \e QT_OPENGL_DLL. See the platform-specific pages, for + instance \l{Qt for Windows}, for more information. This value has + been added in Qt 5.4. + The following values are obsolete: \value AA_ImmediateWidgetCreation This attribute is no longer fully |