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>

3 files changed, 4 insertions, 5 deletions

diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index 006266ca9d..7446e17f76 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -354,8 +354,7 @@ void tst_QEventLoop::throwInExec()
             qPrintable(QString(
                 "Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n"
                 "Try running with QT_NO_GLIB=1 in environment."
-            ).arg(QString::fromLatin1(dispatcher))),
-            SkipAll
+            ).arg(QString::fromLatin1(dispatcher)))
         );
     }
 #endif
diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
index a15e806d49..0613fbc058 100644
--- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
@@ -190,7 +190,7 @@ void tst_QSystemLock::processes_data()
  */
 void tst_QSystemLock::processes()
 {
-    QSKIP("This test takes about 15 minutes and needs to be trimmed down before we can re-enable it", SkipAll);
+    QSKIP("This test takes about 15 minutes and needs to be trimmed down before we can re-enable it");
     QFETCH(int, readOnly);
     QFETCH(int, readWrite);
 
diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index fe1d552708..100aca9d24 100644
--- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -503,7 +503,7 @@ void tst_QSharedMemory::useTooMuchMemory()
 #if !defined(Q_OS_HPUX) && !defined(Q_OS_WINCE)
 void tst_QSharedMemory::attachTooMuch()
 {
-    QSKIP("disabled", SkipAll);
+    QSKIP("disabled");
 
     QSharedMemory government(rememberKey("government"));
     QVERIFY(government.create(1024));
@@ -690,7 +690,7 @@ void tst_QSharedMemory::simpleThreadedProducerConsumer()
     rememberKey(QLatin1String("market"));
 
 #if defined Q_OS_HPUX && defined __ia64
-    QSKIP("This test locks up on gravlaks.troll.no", SkipSingle);
+    QSKIP("This test locks up on gravlaks.troll.no");
 #endif
 
     Producer p;