summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-20 08:52:39 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-20 08:52:39 (GMT)
commite1bdeb521fa1c53a8039fec77fad80994b394413 (patch)
treec9b898e9f2b747e862d51b4d95529179220bb3ed
parenta4b69e877850dc4b934f690e3451e586daffb049 (diff)
downloadQt-e1bdeb521fa1c53a8039fec77fad80994b394413.zip
Qt-e1bdeb521fa1c53a8039fec77fad80994b394413.tar.gz
Qt-e1bdeb521fa1c53a8039fec77fad80994b394413.tar.bz2
This should run on GL ES 2.0 as well.
-rw-r--r--tests/auto/lancelot/tst_lancelot.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp
index 5ec1667..d7a675d 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/lancelot/tst_lancelot.cpp
@@ -191,7 +191,9 @@ void tst_Lancelot::testOpenGL()
bool ok = false;
QGLWidget glWidget;
if (glWidget.isValid() && glWidget.format().directRendering()
- && (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)) {
+ && ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)
+ || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0)))
+ {
glWidget.makeCurrent();
if (!QByteArray((const char *)glGetString(GL_VERSION)).contains("Mesa"))
ok = true;