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, 13 insertions, 13 deletions

diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 35be4ae04f..5fac4739e2 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -209,7 +209,7 @@ void tst_QIcon::actualSize2()
 void tst_QIcon::svgActualSize()
 {
     if (!haveImageFormat("svg")) {
-        QSKIP("SVG support is not available", SkipAll);
+        QSKIP("SVG support is not available");
     }
 
     const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
@@ -423,7 +423,7 @@ void tst_QIcon::detach()
 void tst_QIcon::svg()
 {
     if (!haveImageFormat("svg")) {
-        QSKIP("SVG support is not available", SkipAll);
+        QSKIP("SVG support is not available");
     }
     QIcon icon1("heart.svg");
 
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index a144fdb3fc..e2da34dd6e 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -302,7 +302,7 @@ void tst_QImage::formatHandlersInput()
 	QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile));
     } else {
 	QString msg = "Format not supported : ";
-	QSKIP(QString(msg + testFormat).toLatin1(), SkipSingle);
+	QSKIP(QString(msg + testFormat).toLatin1());
     }
 }
 
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index d36a7bba39..4f9ec0dfb1 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -187,7 +187,7 @@ static const QLatin1String prefix(SRCDIR "/images/");
 // helper to skip an autotest when the given image format is not supported
 #define SKIP_IF_UNSUPPORTED(format) do {                                                          \
     if (!QByteArray(format).isEmpty() && !QImageReader::supportedImageFormats().contains(format)) \
-        QSKIP("\"" + QByteArray(format) + "\" images are not supported", SkipSingle);             \
+        QSKIP("\"" + QByteArray(format) + "\" images are not supported");             \
 } while (0)
 
 // Testing get/set functions
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 996bd6c017..5ff764378a 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -277,7 +277,7 @@ void tst_QPixmap::fromImage()
     const QPixmap pixmap = QPixmap::fromImage(image);
 #ifdef Q_WS_X11
     if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
-        QSKIP("Requires XRender support", SkipAll);
+        QSKIP("Requires XRender support");
 #endif
     const QImage result = pixmap.toImage();
     image = image.convertToFormat(result.format());
@@ -505,12 +505,12 @@ void tst_QPixmap::fill()
 
 #if defined(Q_WS_X11)
     if (!bitmap && pm.handle()->classId() == QPlatformPixmap::X11Class && !pm.x11PictureHandle())
-        QSKIP("Requires XRender support", SkipSingle);
+        QSKIP("Requires XRender support");
 #endif
 
     pm.fill(color);
     if (syscolor && !bitmap && pm.depth() < 24) {
-        QSKIP("Test does not work on displays without true color", SkipSingle);
+        QSKIP("Test does not work on displays without true color");
     }
 
     QImage image = pm.toImage();
@@ -535,7 +535,7 @@ void tst_QPixmap::fill_transparent()
     QPixmap pixmap(10, 10);
 #ifdef Q_WS_X11
     if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
-        QSKIP("Requires XRender support", SkipAll);
+        QSKIP("Requires XRender support");
 #endif
     pixmap.fill(Qt::transparent);
     QVERIFY(pixmap.hasAlphaChannel());
@@ -775,7 +775,7 @@ void tst_QPixmap::grabWidget()
 void tst_QPixmap::grabWindow()
 {
 #ifdef Q_WS_QPA
-    QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends", SkipAll);
+    QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends");
 #endif
 #ifdef Q_OS_WINCE
     // We get out of memory, if the desktop itself is too big.
@@ -839,7 +839,7 @@ void tst_QPixmap::convertFromImageNoDetach()
 {
     QPixmap randomPixmap(10, 10);
     if (randomPixmap.handle()->classId() != QPlatformPixmap::RasterClass)
-        QSKIP("Test only valid for raster pixmaps", SkipAll);
+        QSKIP("Test only valid for raster pixmaps");
 
     //first get the screen format
     QImage::Format screenFormat = randomPixmap.toImage().format();
@@ -1013,7 +1013,7 @@ void tst_QPixmap::toWinHICON_data()
 void tst_QPixmap::toWinHICON()
 {
 #ifdef Q_OS_WINCE
-    QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll);
+    QSKIP("Test shall be enabled for Windows CE shortly.");
 #endif
 
     QFETCH(int, width);
@@ -1057,7 +1057,7 @@ void tst_QPixmap::fromWinHICON_data()
 void tst_QPixmap::fromWinHICON()
 {
 #ifdef Q_OS_WINCE
-    QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll);
+    QSKIP("Test shall be enabled for Windows CE shortly.");
 
 #else
     QFETCH(int, width);
@@ -1084,7 +1084,7 @@ void tst_QPixmap::fromWinHICON()
 void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
 {
 #ifdef Q_WS_QPA
-    QSKIP("QTBUG-20864 can't determine if threaded pixmaps are available for qpa", SkipAll);
+    QSKIP("QTBUG-20864 can't determine if threaded pixmaps are available for qpa");
 #endif
 #if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
     class Thread : public QThread