summaryrefslogtreecommitdiffstats
path: root/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp')
-rw-r--r--tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
index ec87f6f857..7755d89c0b 100644
--- a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
+++ b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
@@ -91,7 +91,7 @@ void tst_QGLFunctions::features()
// Make a context current.
QGLWidget glw;
if (!glw.isValid())
- QSKIP("Could not create a GL context", SkipAll);
+ QSKIP("Could not create a GL context");
glw.makeCurrent();
funcs.initializeGLFunctions();
@@ -195,12 +195,12 @@ void tst_QGLFunctions::multitexture()
QGLFunctions funcs;
QGLWidget glw;
if (!glw.isValid())
- QSKIP("Could not create a GL context", SkipAll);
+ QSKIP("Could not create a GL context");
glw.makeCurrent();
funcs.initializeGLFunctions();
if (!funcs.hasOpenGLFeature(QGLFunctions::Multitexture))
- QSKIP("Multitexture functions are not supported", SkipSingle);
+ QSKIP("Multitexture functions are not supported");
funcs.glActiveTexture(GL_TEXTURE1);
@@ -221,12 +221,12 @@ void tst_QGLFunctions::blendColor()
QGLFunctions funcs;
QGLWidget glw;
if (!glw.isValid())
- QSKIP("Could not create a GL context", SkipAll);
+ QSKIP("Could not create a GL context");
glw.makeCurrent();
funcs.initializeGLFunctions();
if (!funcs.hasOpenGLFeature(QGLFunctions::BlendColor))
- QSKIP("glBlendColor() is not supported", SkipSingle);
+ QSKIP("glBlendColor() is not supported");
funcs.glBlendColor(0.0f, 1.0f, 0.0f, 1.0f);