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>

1 files changed, 12 insertions, 16 deletions

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);