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>

9 files changed, 24 insertions, 24 deletions

diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
index 786051c53c..2745d985a4 100644
--- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
@@ -967,7 +967,7 @@ void tst_QDataStream::stream_QBrush_data()
 void tst_QDataStream::stream_QBrush()
 {
     if (QString(QTest::currentDataTag()).endsWith("6"))
-        QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle);
+        QSKIP("Custom brushes don't seem to be supported with QDataStream");
 
     STREAM_IMPL(QBrush);
 }
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 79e19acbce..07d2afd29c 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -786,7 +786,7 @@ void tst_QDir::canonicalPath()
     else
         srcPath = QDir(".");
     if (srcPath.absolutePath() != srcPath.canonicalPath())
-        QSKIP("This test does not work if this directory path consists of symlinks.", SkipAll);
+        QSKIP("This test does not work if this directory path consists of symlinks.");
 
     QString oldpwd = QDir::currentPath();
     QDir::setCurrent(srcPath.absolutePath());
@@ -1435,7 +1435,7 @@ void tst_QDir::longFileName()
 
     QFile file(fileName);
     if (!file.open(QFile::WriteOnly))
-        QSKIP("Cannot create long file names", SkipAll);
+        QSKIP("Cannot create long file names");
 
     QFile file2(fileName);
     QVERIFY(file2.open(QFile::ReadOnly));
diff --git a/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp b/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp
index f6321c7f79..5e5be42bdf 100644
--- a/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp
+++ b/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp
@@ -438,7 +438,7 @@ void tst_LargeFile::streamPositioning()
 
 #if defined(QT_LARGEFILE_SUPPORT) && defined(Q_CC_MSVC) && _MSC_VER < 1400
     if (position >= (qint64)1 << 31)
-        QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell.", SkipSingle);
+        QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell.");
 #endif
 
     stream_ = QT_FOPEN("qt_largefile.tmp", "rb");
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 59c90f64ec..803b45c3b8 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -525,7 +525,7 @@ void tst_QFile::open()
 #if defined(Q_OS_UNIX)
     if (::getuid() == 0)
         // root and Chuck Norris don't care for file permissions. Skip.
-        QSKIP("Running this test as root doesn't make sense", SkipAll);
+        QSKIP("Running this test as root doesn't make sense");
 #endif
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
@@ -1469,7 +1469,7 @@ void tst_QFile::largeUncFileSupport()
     {
         // 2) stdlib file handling.
 #if _MSC_VER <= 1310
-        QSKIP("platform SDK for MSVC 2003 does not support large files", SkipAll);
+        QSKIP("platform SDK for MSVC 2003 does not support large files");
 #endif
         QFile file;
         FILE *fh = fopen(QFile::encodeName(largeFile).data(), "rb");
@@ -1495,7 +1495,7 @@ void tst_QFile::largeUncFileSupport()
 
 void tst_QFile::tailFile()
 {
-    QSKIP("File change notifications are so far unsupported.", SkipAll);
+    QSKIP("File change notifications are so far unsupported.");
 
     QFile file("tail.txt");
     QVERIFY(file.open(QFile::WriteOnly | QFile::Append));
@@ -1838,7 +1838,7 @@ void tst_QFile::largeFileSupport()
                 QFAIL("Could not open file");
             }
         } else {
-            QSKIP("Not enough space to run test", SkipSingle);
+            QSKIP("Not enough space to run test");
         }
     } else {
         QFAIL("Could not determin disk space");
@@ -2134,7 +2134,7 @@ void tst_QFile::fullDisk()
 {
     QFile file("/dev/full");
     if (!file.exists())
-        QSKIP("/dev/full doesn't exist on this system", SkipAll);
+        QSKIP("/dev/full doesn't exist on this system");
 
     QVERIFY(file.open(QIODevice::WriteOnly));
     file.write("foobar", 6);
@@ -2268,7 +2268,7 @@ void tst_QFile::virtualFile()
 #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
     fname = "/proc/curproc/map";
 #else
-    QSKIP("This platform does not have 0-sized virtual files", SkipAll);
+    QSKIP("This platform does not have 0-sized virtual files");
 #endif
 
     // consistency check
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 76c100163c..4adfb9fad8 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -622,7 +622,7 @@ void tst_QFileInfo::canonicalFilePath()
             (PtrCreateSymbolicLink)QLibrary::resolve(QLatin1String("kernel32"), "CreateSymbolicLinkW");
 
     if (!ptrCreateSymbolicLink) {
-        QSKIP("Symbolic links aren't supported by FS", SkipAll);
+        QSKIP("Symbolic links aren't supported by FS");
     } else {
         // CreateSymbolicLink can return TRUE & still fail to create the link,
         // the error code in that case is ERROR_PRIVILEGE_NOT_HELD (1314)
@@ -630,11 +630,11 @@ void tst_QFileInfo::canonicalFilePath()
         BOOL ret = ptrCreateSymbolicLink((wchar_t*)QString("res").utf16(), (wchar_t*)QString("resources").utf16(), 1);
         DWORD dwErr = GetLastError();
         if (!ret)
-            QSKIP("Symbolic links aren't supported by FS", SkipAll);
+            QSKIP("Symbolic links aren't supported by FS");
         QString currentPath = QDir::currentPath();
         bool is_res_Current = QDir::setCurrent("res");
         if (!is_res_Current && dwErr == 1314)
-            QSKIP("Not enough privilages to create Symbolic links", SkipAll);
+            QSKIP("Not enough privilages to create Symbolic links");
         QCOMPARE(is_res_Current, true);
 
         QCOMPARE(QFileInfo("file1").canonicalFilePath(), currentPath + "/resources/file1");
@@ -1001,7 +1001,7 @@ void tst_QFileInfo::fileTimes()
         QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
 #ifdef Q_OS_UNIX
         if (qIsLikelyToBeNfs(file.handle()))
-            QSKIP("This Test doesn't work on NFS", SkipAll);
+            QSKIP("This Test doesn't work on NFS");
 #endif
         QTextStream ts(&file);
         ts << fileName << endl;
@@ -1313,7 +1313,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data()
         //we need at least one data set for the test not to fail when skipping _data function
         QDir target("target");
         QTest::newRow("dummy") << target.path() << false << "" << target.canonicalPath();
-        QSKIP("symbolic links not supported by operating system",SkipSingle);
+        QSKIP("symbolic links not supported by operating system");
     }
     {
         //Directory symlinks
@@ -1348,7 +1348,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data()
             //we need at least one data set for the test not to assert fail when skipping _data function
             QDir target("target");
             QTest::newRow("dummy") << target.path() << false << "" << target.canonicalPath();
-            QSKIP("link not supported by FS or insufficient privilege", SkipSingle);
+            QSKIP("link not supported by FS or insufficient privilege");
         }
         QVERIFY(file.exists());
 
@@ -1655,7 +1655,7 @@ void tst_QFileInfo::owner()
     qt_ntfs_permission_lookup = 1;
 #endif
     if (userName.isEmpty())
-        QSKIP("Can't retrieve the user name", SkipAll);
+        QSKIP("Can't retrieve the user name");
     QString fileName("ownertest.txt");
     QVERIFY(!QFile::exists(fileName) || QFile::remove(fileName));
     {
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 3468390257..fef2b4675e 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -329,7 +329,7 @@ void tst_QFileSystemWatcher::watchDirectory()
 
     // recreate the file, we should not get any notification
     if (!QDir().mkdir("testDir"))
-        QSKIP("Failed to recreate directory, skipping final test.", SkipSingle);
+        QSKIP("Failed to recreate directory, skipping final test.");
 
     // qDebug() << "waiting max 5 seconds for notification for dir recreation to trigger";
     timer.start(5000);
@@ -467,7 +467,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
     QVERIFY(dirChangedSpy.count() < 2);
 
     if (backend == "dnotify")
-        QSKIP("dnotify is broken, skipping the rest of the test.", SkipSingle);
+        QSKIP("dnotify is broken, skipping the rest of the test.");
 
     fileChangedSpy.clear();
     dirChangedSpy.clear();
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index cb0d0149b6..0662f890e1 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -194,7 +194,7 @@ private:
 #ifdef QT_NO_PROCESS
 void tst_QProcess::initTestCase()
 {
-    QSKIP("This test requires QProcess support", SkipAll);
+    QSKIP("This test requires QProcess support");
 }
 
 #else
@@ -646,7 +646,7 @@ void tst_QProcess::exitStatus()
 
 #ifdef Q_OS_WIN
     if (exitStatus.contains(QProcess::CrashExit))
-        QSKIP("This test opens a crash dialog on Windows", SkipSingle);
+        QSKIP("This test opens a crash dialog on Windows");
 #endif
 
     QCOMPARE(exitStatus.count(), processList.count());
diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
index 1827f8b2d7..00113631f5 100644
--- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
+++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -297,7 +297,7 @@ void tst_QProcessEnvironment::putenv()
     qputenv(envname, "Hello, World");
     QByteArray valAfter = qgetenv(envname);
     if (valAfter != "Hello, World")
-        QSKIP("Could not test: qputenv did not do its job", SkipAll);
+        QSKIP("Could not test: qputenv did not do its job");
 
     QProcessEnvironment eAfter = QProcessEnvironment::systemEnvironment();
 
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 5d3e268d96..eabd4cd761 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -684,7 +684,7 @@ void tst_QSettings::testErrorHandling()
 {
 #if defined(Q_OS_UNIX)
     if (::getuid() == 0)
-        QSKIP("Running this test as root doesn't work, since file perms do not bother him", SkipAll);
+        QSKIP("Running this test as root doesn't work, since file perms do not bother him");
 #else
     QFETCH(int, filePerms);
     QFETCH(int, dirPerms);
@@ -2632,7 +2632,7 @@ void tst_QSettings::fileName()
     QSettings s21(QSettings::SystemScope, QLatin1String("   ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,,  Baz!()#"), "Console");
     QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist"));
 #else
-    QSKIP("Please write a fileName() test for the other platforms", SkipAll);
+    QSKIP("Please write a fileName() test for the other platforms");
 #endif
 }