diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 12:53:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 01:20:29 +0200 |
| commit | 27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch) | |
| tree | 3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/qopengl/tst_qopengl.cpp | |
| parent | 016cd01846539404a0eff1e3823fa2206fe2c9a9 (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/qopengl/tst_qopengl.cpp')
| -rw-r--r-- | tests/auto/qopengl/tst_qopengl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/qopengl/tst_qopengl.cpp b/tests/auto/qopengl/tst_qopengl.cpp index 61e0bb49baf..ebff56fd5c0 100644 --- a/tests/auto/qopengl/tst_qopengl.cpp +++ b/tests/auto/qopengl/tst_qopengl.cpp @@ -297,7 +297,7 @@ void tst_QOpenGL::fboSimpleRendering() ctx.makeCurrent(&window); if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QOpenGLFramebufferObject not supported on this platform"); // No multisample with combined depth/stencil attachment: QOpenGLFramebufferObjectFormat fboFormat; @@ -336,7 +336,7 @@ void tst_QOpenGL::fboRendering() ctx.makeCurrent(&window); if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QOpenGLFramebufferObject not supported on this platform"); // No multisample with combined depth/stencil attachment: QOpenGLFramebufferObjectFormat fboFormat; @@ -346,7 +346,7 @@ void tst_QOpenGL::fboRendering() QOpenGLFramebufferObject fbo(256, 128, fboFormat); if (fbo.attachment() != QOpenGLFramebufferObject::CombinedDepthStencil) - QSKIP("FBOs missing combined depth~stencil support", SkipSingle); + QSKIP("FBOs missing combined depth~stencil support"); fbo.bind(); @@ -378,9 +378,8 @@ void tst_QOpenGL::fboHandleNulledAfterContextDestroyed() ctx.makeCurrent(&window); - if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) { - QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle); - } + if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) + QSKIP("QOpenGLFramebufferObject not supported on this platform"); fbo = new QOpenGLFramebufferObject(128, 128); |