summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-09-16 12:14:45 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-09-16 12:59:19 (GMT)
commitfc2ae0267e6ecbe9a641a44b953f6363beedb501 (patch)
tree57dbfe480aeb5b245731dbb74367116dd98230fa /tests
parent10013ad51f5403859a4996c07960febd5280e093 (diff)
downloadQt-fc2ae0267e6ecbe9a641a44b953f6363beedb501.zip
Qt-fc2ae0267e6ecbe9a641a44b953f6363beedb501.tar.gz
Qt-fc2ae0267e6ecbe9a641a44b953f6363beedb501.tar.bz2
Fix tst_QGL::openGLVersionCheck() autotest on OpenGL ES platforms
Reviewed-by: Trustme
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qgl/tst_qgl.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index a0b8b5d..60a3f87 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -683,8 +683,16 @@ void tst_QGL::openGLVersionCheck()
// However, the complicated parts are in openGLVersionFlags(const QString &versionString)
// tested above
+#if defined(QT_OPENGL_ES_1)
+ QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Common_Version_1_0);
+#elif defined(QT_OPENGL_ES_1_CL)
+ QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_CommonLite_Version_1_0);
+#elif defined(QT_OPENGL_ES_2)
+ QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
+#else
QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_1);
-#endif
+#endif //defined(QT_OPENGL_ES_1)
+#endif //QT_BUILD_INTERNAL
}
class UnclippedWidget : public QWidget