diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 07:46:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 07:46:08 (GMT) |
| commit | 35abe608440f2effd330fd213955e391c4a412a2 (patch) | |
| tree | 675f2da4f2d4d3c05afdec42183d3c76b53c0523 | |
| parent | 550ac75e1639362010e8c24010a8b541a83d8512 (diff) | |
| parent | 0a94e2af3c29afa6e8d7ae3041bed4f187b3c1ca (diff) | |
| download | Qt-35abe608440f2effd330fd213955e391c4a412a2.zip Qt-35abe608440f2effd330fd213955e391c4a412a2.tar.gz Qt-35abe608440f2effd330fd213955e391c4a412a2.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix OpenGLVersionFlags on OpenGL 4.0 systems
| -rw-r--r-- | dist/changes-4.6.4 | 1 | ||||
| -rw-r--r-- | src/opengl/qgl.cpp | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4 index dbb2189..389aa3a 100644 --- a/dist/changes-4.6.4 +++ b/dist/changes-4.6.4 @@ -68,6 +68,7 @@ QtOpenGL * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h). * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL implementation has the GL_ARB_ES2_compatibility extension. + * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems. QtScript -------- diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 0137c85..81e55b3 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1173,8 +1173,16 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co QGLFormat::OpenGL_Version_2_1 | QGLFormat::OpenGL_Version_3_0; } - else - qWarning("Unrecognised OpenGL version"); + else { + versionFlags |= QGLFormat::OpenGL_Version_1_1 | + QGLFormat::OpenGL_Version_1_2 | + QGLFormat::OpenGL_Version_1_3 | + QGLFormat::OpenGL_Version_1_4 | + QGLFormat::OpenGL_Version_1_5 | + QGLFormat::OpenGL_Version_2_0 | + QGLFormat::OpenGL_Version_2_1 | + QGLFormat::OpenGL_Version_3_0; + } } return versionFlags; } |