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>

4 files changed, 37 insertions, 41 deletions

diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index e1c3462560..c9b4800b53 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -145,7 +145,7 @@ static int appDefaultDepth()
 void tst_QGL::getSetCheck()
 {
     if (!QGLFormat::hasOpenGL())
-        QSKIP("QGL not supported on this platform", SkipAll);
+        QSKIP("QGL not supported on this platform");
 
     QGLFormat obj1;
     // int QGLFormat::depthBufferSize()
@@ -656,7 +656,7 @@ void tst_QGL::openGLVersionCheck()
 {
 #ifdef QT_BUILD_INTERNAL
     if (!QGLFormat::hasOpenGL())
-        QSKIP("QGL not supported on this platform", SkipAll);
+        QSKIP("QGL not supported on this platform");
 
     QString versionString;
     QGLFormat::OpenGLVersionFlags expectedFlag;
@@ -895,7 +895,7 @@ void tst_QGL::partialGLWidgetUpdates_data()
 void tst_QGL::partialGLWidgetUpdates()
 {
     if (!QGLFormat::hasOpenGL())
-        QSKIP("QGL not supported on this platform", SkipAll);
+        QSKIP("QGL not supported on this platform");
 
     QFETCH(bool, doubleBufferedContext);
     QFETCH(bool, autoFillBackground);
@@ -923,7 +923,7 @@ void tst_QGL::partialGLWidgetUpdates()
     QTest::qWait(200);
 
     if (widget.format().doubleBuffer() != doubleBufferedContext)
-        QSKIP("Platform does not support requested format", SkipAll);
+        QSKIP("Platform does not support requested format");
 
     widget.paintEventRegion = QRegion();
     widget.repaint(50, 50, 50, 50);
@@ -939,7 +939,7 @@ void tst_QGL::partialGLWidgetUpdates()
 void tst_QGL::glPBufferRendering()
 {
     if (!QGLPixelBuffer::hasOpenGLPbuffers())
-        QSKIP("QGLPixelBuffer not supported on this platform", SkipSingle);
+        QSKIP("QGLPixelBuffer not supported on this platform");
 
     QGLPixelBuffer* pbuf = new QGLPixelBuffer(128, 128);
 
@@ -1063,7 +1063,7 @@ void tst_QGL::glWidgetRendering()
 void tst_QGL::glFBOSimpleRendering()
 {
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+        QSKIP("QGLFramebufferObject not supported on this platform");
 
     QGLWidget glw;
     glw.makeCurrent();
@@ -1097,7 +1097,7 @@ void tst_QGL::glFBOSimpleRendering()
 void tst_QGL::glFBORendering()
 {
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+        QSKIP("QGLFramebufferObject not supported on this platform");
 
     QGLWidget glw;
     glw.makeCurrent();
@@ -1111,7 +1111,7 @@ void tst_QGL::glFBORendering()
 
     if (fbo->attachment() != QGLFramebufferObject::CombinedDepthStencil) {
         delete fbo;
-        QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
+        QSKIP("FBOs missing combined depth~stencil support");
     }
 
     QPainter fboPainter;
@@ -1135,7 +1135,7 @@ void tst_QGL::glFBORendering()
 void tst_QGL::multipleFBOInterleavedRendering()
 {
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+        QSKIP("QGLFramebufferObject not supported on this platform");
 
     QGLWidget glw;
     glw.makeCurrent();
@@ -1155,7 +1155,7 @@ void tst_QGL::multipleFBOInterleavedRendering()
         delete fbo1;
         delete fbo2;
         delete fbo3;
-        QSKIP("FBOs missing combined depth~stencil support", SkipSingle);
+        QSKIP("FBOs missing combined depth~stencil support");
     }
 
     QPainter fbo1Painter;
@@ -1169,7 +1169,7 @@ void tst_QGL::multipleFBOInterleavedRendering()
     // Confirm we're using the GL2 engine, as interleaved rendering isn't supported
     // on the GL1 engine:
     if (fbo1Painter.paintEngine()->type() != QPaintEngine::OpenGL2)
-        QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher", SkipSingle);
+        QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher");
 
     QPainterPath intersectingPath;
     intersectingPath.moveTo(0, 0);
@@ -1282,7 +1282,7 @@ protected:
 void tst_QGL::glFBOUseInGLWidget()
 {
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+        QSKIP("QGLFramebufferObject not supported on this platform");
 
     FBOUseInGLWidget w;
 #ifdef Q_WS_QWS
@@ -1401,7 +1401,7 @@ void tst_QGL::glWidgetRenderPixmap()
     reference.fill(0xffff0000);
 
 #if defined(QGL_EGL) && !defined(Q_WS_X11)
-    QSKIP("renderPixmap() not yet supported under EGL on your platform", SkipAll);
+    QSKIP("renderPixmap() not yet supported under EGL on your platform");
 #endif
 
     QFUZZY_COMPARE_IMAGES(fb, reference);
@@ -1825,7 +1825,7 @@ void tst_QGL::clipTest()
 void tst_QGL::destroyFBOAfterContext()
 {
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+        QSKIP("QGLFramebufferObject not supported on this platform");
 
     QGLWidget *glw = new QGLWidget();
     glw->makeCurrent();
@@ -1896,7 +1896,7 @@ void tst_QGL::shareRegister()
     if (!glw2->isSharing()) {
         delete glw2;
         delete glw1;
-        QSKIP("Context sharing is not supported", SkipSingle);
+        QSKIP("Context sharing is not supported");
     }
     QVERIFY(glw1->isSharing());
     QVERIFY(glw1->context() != glw2->context());
@@ -2352,7 +2352,7 @@ void tst_QGL::threadImages()
 void tst_QGL::nullRectCrash()
 {
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle);
+        QSKIP("QGLFramebufferObject not supported on this platform");
 
     QGLWidget glw;
     glw.makeCurrent();
@@ -2380,7 +2380,7 @@ public:
 
 private slots:
     void qglSkipTests() {
-	QSKIP("QGL not supported on this system.", SkipAll);
+	QSKIP("QGL not supported on this system.");
     }
 };
 
diff --git a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
index 9215b5fedd..399d624027 100644
--- a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
+++ b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
@@ -110,7 +110,7 @@ void tst_QGLBuffer::testBuffer(QGLBuffer::Type type)
     // Create the buffer - if this fails, then assume that the
     // GL implementation does not support buffers at all.
     if (!buffer.create())
-        QSKIP("Buffers are not supported on this platform", SkipAll);
+        QSKIP("Buffers are not supported on this platform");
 
     // Should now have a buffer id.
     QVERIFY(buffer.bufferId() != 0);
@@ -209,13 +209,13 @@ void tst_QGLBuffer::bufferSharing()
     if (!w2->isSharing()) {
         delete w2;
         delete w1;
-        QSKIP("Context sharing is not supported on this platform", SkipSingle);
+        QSKIP("Context sharing is not supported on this platform");
     }
 
     // Bind the buffer in the first context and write some data to it.
     QGLBuffer buffer(QGLBuffer::VertexBuffer);
     if (!buffer.create())
-        QSKIP("Buffers are not supported on this platform", SkipSingle);
+        QSKIP("Buffers are not supported on this platform");
     QVERIFY(buffer.isCreated());
     QVERIFY(buffer.bind());
     static GLfloat const data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
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);
 
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index 96624a9485..940220217d 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -141,7 +141,7 @@ public:
 void tst_QGLThreads::swapInThread()
 {
 #ifdef Q_OS_MAC
-    QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll);
+    QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots");
 #endif
 
     QGLFormat format;
@@ -250,7 +250,7 @@ private:
 void tst_QGLThreads::textureUploadInThread()
 {
 #ifdef Q_OS_MAC
-    QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll);
+    QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots");
 #endif
 
     TextureDisplay display;
@@ -425,7 +425,7 @@ void tst_QGLThreads::renderInThread_data()
 void tst_QGLThreads::renderInThread()
 {
 #ifdef Q_OS_MAC
-    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
+    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
 #endif
 
     QFETCH(bool, resize);
@@ -633,11 +633,11 @@ private:
 void tst_QGLThreads::painterOnGLWidgetInThread()
 {
 #ifdef Q_OS_MAC
-    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
+    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
 #endif
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
           (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
-        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll);
+        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
     }
 
     PaintThreadManager<GLWidgetWrapper> painterThreads(5);
@@ -657,7 +657,7 @@ void tst_QGLThreads::painterOnGLWidgetInThread()
 void tst_QGLThreads::painterOnPixmapInThread()
 {
 #ifdef Q_WS_X11
-    QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.", SkipAll);
+    QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.");
 #endif
     PaintThreadManager<PixmapWrapper> painterThreads(5);
     painterThreads.start();
@@ -675,17 +675,15 @@ void tst_QGLThreads::painterOnPixmapInThread()
 void tst_QGLThreads::painterOnPboInThread()
 {
 #ifdef Q_OS_MAC
-    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
+    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
 #endif
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
           (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
-        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll);
-        return;
+        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
     }
 
     if (!QGLPixelBuffer::hasOpenGLPbuffers()) {
-        QSKIP("This system doesn't support pbuffers.", SkipAll);
-        return;
+        QSKIP("This system doesn't support pbuffers.");
     }
 
     PaintThreadManager<PixelBufferWrapper> painterThreads(5);
@@ -705,17 +703,15 @@ void tst_QGLThreads::painterOnPboInThread()
 void tst_QGLThreads::painterOnFboInThread()
 {
 #ifdef Q_OS_MAC
-    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll);
+    QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots");
 #endif
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
           (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
-        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll);
-        return;
+        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
     }
 
     if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
-        QSKIP("This system doesn't support framebuffer objects.", SkipAll);
-        return;
+        QSKIP("This system doesn't support framebuffer objects.");
     }
 
     PaintThreadManager<FrameBufferObjectWrapper> painterThreads(5);