From fc2ae0267e6ecbe9a641a44b953f6363beedb501 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Wed, 16 Sep 2009 14:14:45 +0200 Subject: Fix tst_QGL::openGLVersionCheck() autotest on OpenGL ES platforms Reviewed-by: Trustme --- tests/auto/qgl/tst_qgl.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 -- cgit v0.12