diff options
| author | aavit <qt-info@nokia.com> | 2010-09-07 08:23:29 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-09-07 08:23:29 (GMT) |
| commit | a9fcb1703962bb5d00d6779a10eb5b1aa234b76d (patch) | |
| tree | 8c0624e0a759eb16d27f4a493b4a19033167300c /tests | |
| parent | c142da9f1573738bb0c9e4c728bab4b3c2c8f438 (diff) | |
| parent | e800ada8fea5b3f5858574696b373959a8e15b43 (diff) | |
| download | Qt-a9fcb1703962bb5d00d6779a10eb5b1aa234b76d.zip Qt-a9fcb1703962bb5d00d6779a10eb5b1aa234b76d.tar.gz Qt-a9fcb1703962bb5d00d6779a10eb5b1aa234b76d.tar.bz2 | |
Merge branch 'lancelot' of scm.dev.nokia.troll.no:qt/aavits-graphicsstuff into lancelot
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/lancelot/tst_lancelot.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp index 7381c1d..23a5c94 100644 --- a/tests/auto/lancelot/tst_lancelot.cpp +++ b/tests/auto/lancelot/tst_lancelot.cpp @@ -175,7 +175,14 @@ void tst_Lancelot::testOpenGL_data() void tst_Lancelot::testOpenGL() { - runTestSuite(); + QGLWidget glWidget; + if (glWidget.isValid() && glWidget.format().directRendering() + && (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)) + { + runTestSuite(); + } else { + QSKIP("System under test does not meet preconditions for GL testing. Skipping.", SkipAll); + } } |