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, 4 insertions, 6 deletions

diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index d21c673b6d..3566342f00 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -167,8 +167,7 @@ void tst_QFont::exactMatch()
     QVERIFY(QFont("monospace").exactMatch());
 #endif
 
-    QSKIP("This test is bogus on Unix with support for font aliases in fontconfig", SkipAll);
-    return;
+    QSKIP("This test is bogus on Unix with support for font aliases in fontconfig");
 
     QFontDatabase fdb;
 
@@ -538,9 +537,8 @@ void tst_QFont::setFontRaw()
         if (str.toLower() == "fixed")
             found = true;
     }
-    if (!found) {
-        QSKIP("Fixed font not available.", SkipSingle);
-    }
+    if (!found)
+        QSKIP("Fixed font not available.");
     QCOMPARE(QFontInfo(f).family().left(5).toLower(), QString("fixed"));
 }
 #endif
@@ -654,7 +652,7 @@ void tst_QFont::defaultFamily()
 
     QFontDatabase db;
     if (!db.hasFamily(defaultFamily))
-        QSKIP("Font family is not available on the system", SkipSingle);
+        QSKIP("Font family is not available on the system");
 
     QFont f;
     f.setStyleHint(styleHint);