diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 20:12:24 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 20:12:24 (GMT) |
commit | 7795c14a574fcee67c840ce996602d61e66683f5 (patch) | |
tree | 299a12bc79a827f8502f2f118b4254ceeaf1e7a0 /tests/auto/qgl/tst_qgl.cpp | |
parent | ef0404ed32c2eee65cfca6137c2d9ebe67e1c5bd (diff) | |
parent | a62045401cc8f55c3175a2b33e8f43b356604f37 (diff) | |
download | Qt-7795c14a574fcee67c840ce996602d61e66683f5.zip Qt-7795c14a574fcee67c840ce996602d61e66683f5.tar.gz Qt-7795c14a574fcee67c840ce996602d61e66683f5.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't run the QGL test on systems that does not have GL support.
Remove an useless assert from comp_func_SourceOver_sse2()
QScriptEngineAgent: recompile all the function when installing a debugger.
QScriptDeclarativeObject: we need to save the current stack pointer.
QScriptValue::objectId(): do not assert if the value is not a cell
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
Diffstat (limited to 'tests/auto/qgl/tst_qgl.cpp')
-rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 8ee494f..7fe461c 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -2252,5 +2252,30 @@ void tst_QGL::textureCleanup() #endif } -QTEST_MAIN(tst_QGL) +class tst_QGLDummy : public QObject +{ +Q_OBJECT + +public: + tst_QGLDummy() {} + +private slots: + void qglSkipTests() { + QSKIP("QGL not supported on this system.", SkipAll); + } +}; + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + QTEST_DISABLE_KEYPAD_NAVIGATION \ + QGLWidget glWidget; + if (!glWidget.isValid()) { + tst_QGLDummy tc; + return QTest::qExec(&tc, argc, argv); + } + tst_QGL tc; + return QTest::qExec(&tc, argc, argv); +} + #include "tst_qgl.moc" |