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

diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index 453eb44daa..2cbf30ba74 100644
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
@@ -220,7 +220,7 @@ void tst_QSql::openErrorRecovery()
 
     dbs.addDbs();
     if (dbs.dbNames.isEmpty())
-        QSKIP("No database drivers installed", SkipAll);
+        QSKIP("No database drivers installed");
     foreach ( const QString& dbName, dbs.dbNames ) {
 	QSqlDatabase db = QSqlDatabase::database( dbName, false );
 	CHECK_DATABASE( db );
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 9515d01049..1d72b2bf41 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -71,7 +71,7 @@
 #define QFAIL_SQL(q, stmt) QVERIFY2(!(q).stmt, tst_Databases::printError((q).lastError(), db))
 
 #define DBMS_SPECIFIC(db, driver) \
-    if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test", SkipSingle); }
+    if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test"); }
 
 // ### use QSystem::hostName if it is integrated in qtest/main
 static QString qGetHostName()
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 26e91c1153..dab9933223 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -421,9 +421,9 @@ void tst_QSqlDatabase::generic_data(const QString& engine)
 {
     if ( dbs.fillTestTable(engine) == 0 ) {
         if(engine.isEmpty())
-           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+           QSKIP( "No database drivers are available in this Qt configuration");
         else
-           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
     }
 }
 
@@ -476,7 +476,7 @@ void tst_QSqlDatabase::tables()
 
     QSqlQuery q(db);
     if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
-        QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+        QSKIP( "Test requires MySQL >= 5.0");
 
 
     if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) {
@@ -553,7 +553,7 @@ void tst_QSqlDatabase::whitespaceInIdentifiers()
         else
             QCOMPARE(idx.field(0).type(), QVariant::Int);
     } else {
-        QSKIP("DBMS does not support whitespaces in identifiers", SkipSingle);
+        QSKIP("DBMS does not support whitespaces in identifiers");
     }
 }
 
@@ -576,7 +576,7 @@ void tst_QSqlDatabase::alterTable()
     }
 
     if (!q.exec("alter table " + qtestalter + " drop column F2")) {
-        QSKIP("DBMS doesn't support dropping columns in ALTER TABLE statement", SkipSingle);
+        QSKIP("DBMS doesn't support dropping columns in ALTER TABLE statement");
     }
 
     rec = db.record(qtestalter);
@@ -985,7 +985,7 @@ void tst_QSqlDatabase::recordSQLServer()
     CHECK_DATABASE(db);
 
     if (!tst_Databases::isSqlServer(db))
-        QSKIP("SQL server specific test", SkipSingle);
+        QSKIP("SQL server specific test");
 
     // ### TODO: Add the rest of the fields
     static const FieldDef fieldDefs[] = {
@@ -1014,7 +1014,7 @@ void tst_QSqlDatabase::recordAccess()
     CHECK_DATABASE(db);
 
     if (!tst_Databases::isMSAccess(db))
-        QSKIP("MS Access specific test", SkipSingle);
+        QSKIP("MS Access specific test");
 
     QString memo;
     for (int i = 0; i < 32; i++)
@@ -1045,7 +1045,7 @@ void tst_QSqlDatabase::transaction()
     const QString qtest(qTableName("qtest", __FILE__));
 
     if (!db.driver()->hasFeature(QSqlDriver::Transactions))
-        QSKIP("DBMS not transaction capable", SkipSingle);
+        QSKIP("DBMS not transaction capable");
 
     QVERIFY(db.transaction());
 
@@ -1073,7 +1073,7 @@ void tst_QSqlDatabase::transaction()
     q.clear(); // for SQLite which does not allow any references on rows that shall be rolled back
     if (!db.rollback()) {
         if (db.driverName().startsWith("QMYSQL"))
-            QSKIP("MySQL transaction failed: " + tst_Databases::printError(db.lastError()), SkipSingle);
+            QSKIP("MySQL transaction failed: " + tst_Databases::printError(db.lastError()));
         else
             QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError()));
     }
@@ -1110,7 +1110,7 @@ void tst_QSqlDatabase::bigIntField()
     //} else if (drvName.startsWith("QIBASE")) {
     //    QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int64, t_u64bit int64)"));
     } else {
-        QSKIP("no 64 bit integer support", SkipAll);
+        QSKIP("no 64 bit integer support");
     }
     QVERIFY(q.prepare("insert into " + qtest_bigint + " values (?, ?, ?)"));
     qlonglong ll = Q_INT64_C(9223372036854775807);
@@ -1205,7 +1205,7 @@ void tst_QSqlDatabase::psql_schemas()
     CHECK_DATABASE(db);
 
     if (!db.tables(QSql::SystemTables).contains("pg_namespace"))
-        QSKIP("server does not support schemas", SkipSingle);
+        QSKIP("server does not support schemas");
 
     QSqlQuery q(db);
 
@@ -1238,7 +1238,7 @@ void tst_QSqlDatabase::psql_escapedIdentifiers()
     CHECK_DATABASE(db);
 
     if (!db.tables(QSql::SystemTables).contains("pg_namespace"))
-        QSKIP("server does not support schemas", SkipSingle);
+        QSKIP("server does not support schemas");
 
     QSqlQuery q(db);
 
@@ -1315,7 +1315,7 @@ void tst_QSqlDatabase::bug_249059()
     QString version=tst_Databases::getPSQLVersion( db );
     double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble();
     if (ver < 7.3)
-        QSKIP("Test requires PostgreSQL >= 7.3", SkipSingle);
+        QSKIP("Test requires PostgreSQL >= 7.3");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("bug_249059", __FILE__));
@@ -1355,7 +1355,7 @@ void tst_QSqlDatabase::precisionPolicy()
     QSqlQuery q(db);
     const QString tableName(qTableName("qtest_prec", __FILE__));
     if(!db.driver()->hasFeature(QSqlDriver::LowPrecisionNumbers))
-        QSKIP("Driver or database doesn't support setting precision policy", SkipSingle);
+        QSKIP("Driver or database doesn't support setting precision policy");
 
     // Create a test table with some data
     if(tst_Databases::isMSAccess(db))
@@ -1445,7 +1445,7 @@ void tst_QSqlDatabase::mysqlOdbc_unsignedIntegers()
     CHECK_DATABASE(db);
 
     if (!db.driverName().startsWith("QODBC") || !dbName.toUpper().contains("MYSQL"))
-       QSKIP("MySQL through ODBC-driver specific test", SkipSingle);
+       QSKIP("MySQL through ODBC-driver specific test");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("uint", __FILE__));
@@ -1469,7 +1469,7 @@ void tst_QSqlDatabase::accessOdbc_strings()
     CHECK_DATABASE(db);
 
     if (!tst_Databases::isMSAccess(db))
-        QSKIP("MS Access specific test", SkipSingle);
+        QSKIP("MS Access specific test");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("strings", __FILE__));
@@ -1629,7 +1629,7 @@ void tst_QSqlDatabase::ibase_procWithReturnValues()
     CHECK_DATABASE(db);
 
     if (!db.driverName().startsWith("QIBASE"))
-       QSKIP("InterBase specific test", SkipSingle);
+       QSKIP("InterBase specific test");
 
     const QString procName(qTableName("qtest_proc2", __FILE__));
 
@@ -1716,7 +1716,7 @@ void tst_QSqlDatabase::odbc_bindBoolean()
     CHECK_DATABASE(db);
 
     if (tst_Databases::isMySQL(db))
-        QSKIP("MySql has inconsistent behaviour of bit field type across versions.", SkipSingle);
+        QSKIP("MySql has inconsistent behaviour of bit field type across versions.");
 
     QSqlQuery q(db);
     QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("qtestBindBool", __FILE__) + "(id int, boolvalue bit)"));
@@ -1795,7 +1795,7 @@ void tst_QSqlDatabase::mysql_multiselect()
     QString version=tst_Databases::getMySqlVersion( db );
     double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble();
     if (ver < 4.1)
-        QSKIP("Test requires MySQL >= 4.1", SkipSingle);
+        QSKIP("Test requires MySQL >= 4.1");
 
     QVERIFY_SQL(q, exec("SELECT * FROM " + qtest + "; SELECT * FROM " + qtest));
     QVERIFY_SQL(q, next());
@@ -1859,7 +1859,7 @@ void tst_QSqlDatabase::oci_xmltypeSupport()
 
     // Embedding the XML in the statement
     if(!q.exec(QString("CREATE TABLE %1(xmldata xmltype)").arg(tableName)))
-        QSKIP("This test requries xml type support", SkipSingle);
+        QSKIP("This test requries xml type support");
     QVERIFY_SQL(q, exec(QString("INSERT INTO %1 values('%2')").arg(tableName).arg(xml)));
     QVERIFY_SQL(q, exec(QString("SELECT a.xmldata.getStringVal() FROM %1 a").arg(tableName)));
     QVERIFY_SQL(q, last());
@@ -1928,7 +1928,7 @@ void tst_QSqlDatabase::odbc_uniqueidentifier()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
     if (!tst_Databases::isSqlServer(db))
-        QSKIP("SQL Server (ODBC) specific test", SkipSingle);
+        QSKIP("SQL Server (ODBC) specific test");
 
     const QString tableName(qTableName("qtest_sqlguid", __FILE__));
     QString guid = QString("AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE");
@@ -1998,7 +1998,7 @@ void tst_QSqlDatabase::eventNotification()
 
     QSqlDriver *driver = db.driver();
     if (!driver->hasFeature(QSqlDriver::EventNotifications))
-        QSKIP("DBMS doesn't support event notifications", SkipSingle);
+        QSKIP("DBMS doesn't support event notifications");
 
     // Not subscribed to any events yet
     QCOMPARE(driver->subscribedToNotifications().size(), 0);
@@ -2067,7 +2067,7 @@ void tst_QSqlDatabase::eventNotificationPSQL()
     CHECK_DATABASE(db);
 
 #if defined(Q_OS_LINUX)
-    QSKIP( "Event support doesn't work on linux", SkipAll );
+    QSKIP( "Event support doesn't work on linux");
 #endif
 
     QSqlQuery query(db);
@@ -2090,7 +2090,7 @@ void tst_QSqlDatabase::sqlite_bindAndFetchUInt()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
     if (db.driverName().startsWith("QSQLITE2"))
-        QSKIP("SQLite3 specific test", SkipSingle);
+        QSKIP("SQLite3 specific test");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("uint_test", __FILE__));
@@ -2155,7 +2155,7 @@ void tst_QSqlDatabase::mysql_savepointtest()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
     if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 1 ).toDouble()<4.1 )
-        QSKIP( "Test requires MySQL >= 4.1", SkipSingle );
+        QSKIP( "Test requires MySQL >= 4.1");
 
     QSqlQuery q(db);
     QVERIFY_SQL(q, exec("begin"));
@@ -2179,7 +2179,7 @@ void tst_QSqlDatabase::sqlite_enable_cache_mode()
 {
     QFETCH(QString, dbName);
     if(dbName.endsWith(":memory:"))
-        QSKIP( "cache mode is meaningless for :memory: databases", SkipSingle );
+        QSKIP( "cache mode is meaningless for :memory: databases");
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
     db.close();
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index bb77eebd1b..7d622dbd56 100644
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
@@ -76,7 +76,7 @@ void tst_QSqlDriver::initTestCase_data()
 {
     dbs.open();
     if (dbs.fillTestTable() == 0)
-        QSKIP("No database drivers are available in this Qt configuration", SkipAll);
+        QSKIP("No database drivers are available in this Qt configuration");
 }
 
 void tst_QSqlDriver::recreateTestTables(QSqlDatabase db)
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 5546cefd09..c2c66a5642 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -294,9 +294,9 @@ void tst_QSqlQuery::generic_data(const QString& engine)
 {
     if ( dbs.fillTestTable(engine) == 0 ) {
         if(engine.isEmpty())
-           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+           QSKIP( "No database drivers are available in this Qt configuration");
         else
-           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
     }
 }
 
@@ -428,14 +428,14 @@ void tst_QSqlQuery::char1SelectUnicode()
     CHECK_DATABASE( db );
 
     if(db.driverName().startsWith("QDB2"))
-        QSKIP("Needs someone with more Unicode knowledge than I have to fix", SkipSingle);
+        QSKIP("Needs someone with more Unicode knowledge than I have to fix");
 
     if ( db.driver()->hasFeature( QSqlDriver::Unicode ) ) {
         QString uniStr( QChar(0x0915) ); // DEVANAGARI LETTER KA
         QSqlQuery q( db );
 
         if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
-            QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+            QSKIP( "Test requires MySQL >= 5.0");
 
         QString createQuery;
         const QString char1SelectUnicode(qTableName( "char1SU", __FILE__ ));
@@ -475,7 +475,7 @@ void tst_QSqlQuery::char1SelectUnicode()
         QVERIFY( !q.next() );
     }
     else
-        QSKIP( "Database not unicode capable", SkipSingle );
+        QSKIP( "Database not unicode capable");
 }
 
 void tst_QSqlQuery::oraRowId()
@@ -523,7 +523,7 @@ void tst_QSqlQuery::mysqlOutValues()
     QSqlQuery q( db );
 
     if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
-        QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+        QSKIP( "Test requires MySQL >= 5.0");
 
     q.exec( "drop function " + hello );
 
@@ -572,7 +572,7 @@ void tst_QSqlQuery::oraOutValues()
     const QString tst_outValues(qTableName("tst_outValues", __FILE__));
 
     if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
-        QSKIP( "Test requires prepared query support", SkipSingle );
+        QSKIP( "Test requires prepared query support");
 
     QSqlQuery q( db );
 
@@ -754,7 +754,7 @@ void tst_QSqlQuery::outValuesDB2()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
-        QSKIP( "Test requires prepared query support", SkipSingle );
+        QSKIP( "Test requires prepared query support");
 
     QSqlQuery q( db );
 
@@ -791,7 +791,7 @@ void tst_QSqlQuery::outValues()
     const QString tst_outValues(qTableName("tst_outValues", __FILE__));
 
     if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
-        QSKIP( "Test requires prepared query support", SkipSingle );
+        QSKIP( "Test requires prepared query support");
 
     QSqlQuery q( db );
 
@@ -819,7 +819,7 @@ void tst_QSqlQuery::outValues()
                                 "end\n" ) );
         QVERIFY( q.prepare( "{call " + tst_outValues + "(?)}" ) );
     } else
-        QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test", SkipSingle );
+        QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test");
 
     q.addBindValue( 0, QSql::Out );
 
@@ -838,7 +838,7 @@ void tst_QSqlQuery::blob()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) )
-        QSKIP( "DBMS not BLOB capable", SkipSingle );
+        QSKIP( "DBMS not BLOB capable");
 
     //don' make it too big otherwise sybase and mysql will complain
     QByteArray ba( BLOBSIZE, 0 );
@@ -994,7 +994,7 @@ void tst_QSqlQuery::numRowsAffected()
         ++i;
 
     if ( q.numRowsAffected() == -1 || q.numRowsAffected() == 0 )
-        QSKIP("Database doesn't support numRowsAffected", SkipSingle);
+        QSKIP("Database doesn't support numRowsAffected");
 
     if ( q.numRowsAffected() != -1 && q.numRowsAffected() != 0 && q.numRowsAffected() != i ) {
         // the value is undefined for SELECT, this check is just here for curiosity
@@ -1346,7 +1346,7 @@ void tst_QSqlQuery::bitField()
     CHECK_DATABASE( db );
 
     if ( !db.driverName().startsWith( "QTDS" ) )
-        QSKIP( "TDS specific test", SkipSingle );
+        QSKIP( "TDS specific test");
 
     QSqlQuery q( db );
 
@@ -1434,7 +1434,7 @@ void tst_QSqlQuery::precision()
     static const char* precStr = "1.2345678901234567891";
 
     if ( db.driverName().startsWith( "QIBASE" ) )
-        QSKIP( "DB unable to store high precision", SkipSingle );
+        QSKIP( "DB unable to store high precision");
 
     {
         // need a new scope for SQLITE
@@ -1499,14 +1499,14 @@ void tst_QSqlQuery::nullResult()
 void tst_QSqlQuery::transaction()
 {
     // query based transaction is not really possible with Qt
-    QSKIP( "only tested manually by trained staff", SkipAll );
+    QSKIP( "only tested manually by trained staff");
 
     QFETCH( QString, dbName );
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::Transactions ) )
-        QSKIP( "DBMS not transaction capable", SkipSingle );
+        QSKIP( "DBMS not transaction capable");
 
     // this is the standard SQL
     QString startTransactionStr( "start transaction" );
@@ -1551,7 +1551,7 @@ void tst_QSqlQuery::transaction()
     if ( !q.exec( "rollback" ) ) {
         if ( db.driverName().startsWith( "QMYSQL" ) ) {
             qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) ));
-            QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal
+            QSKIP( "MySQL transaction failed "); //non-fatal
         } else
             QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) );
     }
@@ -1595,7 +1595,7 @@ void tst_QSqlQuery::joins()
             || db.driverName().startsWith( "QIBASE" ) )
         // Oracle broken beyond recognition - cannot outer join on more than
         // one table.
-        QSKIP( "DBMS cannot understand standard SQL", SkipSingle );
+        QSKIP( "DBMS cannot understand standard SQL");
 
     QSqlQuery q( db );
 
@@ -1657,9 +1657,9 @@ void tst_QSqlQuery::prepare_bind_exec()
     const QString qtest_prepare(qTableName("qtest_prepare", __FILE__));
 
     if(db.driverName().startsWith("QIBASE") && (db.databaseName() == "silence.nokia.troll.no:c:\\ibase\\testdb_ascii" || db.databaseName() == "/opt/interbase/qttest.gdb"))
-        QSKIP("Can't transliterate extended unicode to ascii", SkipSingle);
+        QSKIP("Can't transliterate extended unicode to ascii");
     if(db.driverName().startsWith("QDB2"))
-        QSKIP("Needs someone with more Unicode knowledge than I have to fix", SkipSingle);
+        QSKIP("Needs someone with more Unicode knowledge than I have to fix");
 
     {
         // new scope for SQLITE
@@ -1878,7 +1878,7 @@ void tst_QSqlQuery::sqlServerLongStrings()
     CHECK_DATABASE( db );
 
     if ( !tst_Databases::isSqlServer( db ) )
-        QSKIP( "SQL Server specific test", SkipSingle );
+        QSKIP( "SQL Server specific test");
 
     QSqlQuery q( db );
 
@@ -1963,7 +1963,7 @@ void tst_QSqlQuery::batchExec()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
-        QSKIP( "Database can't do BatchOperations", SkipSingle );
+        QSKIP( "Database can't do BatchOperations");
 
     QSqlQuery q( db );
     const QString tableName = qTableName( "qtest_batch", __FILE__ );
@@ -2018,7 +2018,7 @@ void tst_QSqlQuery::oraArrayBind()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
-        QSKIP( "Database can't do BatchOperations", SkipSingle );
+        QSKIP( "Database can't do BatchOperations");
 
     QSqlQuery q( db );
 
@@ -2180,7 +2180,7 @@ void tst_QSqlQuery::lastInsertId()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::LastInsertId ) )
-        QSKIP( "Database doesn't support lastInsertId", SkipSingle );
+        QSKIP( "Database doesn't support lastInsertId");
 
     QSqlQuery q( db );
 
@@ -2213,7 +2213,7 @@ void tst_QSqlQuery::bindWithDoubleColonCastOperator()
     // Only PostgreSQL support the double-colon cast operator
 
     if ( !db.driverName().startsWith( "QPSQL" ) )
-        QSKIP( "Test requires PostgreSQL", SkipSingle );
+        QSKIP( "Test requires PostgreSQL");
 
     const QString tablename(qTableName( "bindtest", __FILE__ ));
 
@@ -2281,7 +2281,7 @@ void tst_QSqlQuery::createQueryOnClosedDatabase()
             && !db.driverName().startsWith( "QOCI" )
             && !db.driverName().startsWith( "QMYSQL" )
             && !db.driverName().startsWith( "QDB2" ) )
-        QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2", SkipSingle );
+        QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2");
 
     db.close();
 
@@ -2367,10 +2367,10 @@ void tst_QSqlQuery::sqlite_finish()
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
     if (db.driverName() != QLatin1String("QSQLITE"))
-        QSKIP("Sqlite3 specific test", SkipSingle);
+        QSKIP("Sqlite3 specific test");
 
     if ( db.databaseName().startsWith( ':' ) )
-        QSKIP( "This test requires a database on the filesystem, not in-memory", SkipAll );
+        QSKIP( "This test requires a database on the filesystem, not in-memory");
 
     {
         QSqlDatabase db2 = QSqlDatabase::addDatabase( "QSQLITE", "sqlite_finish_sqlite" );
@@ -2412,12 +2412,12 @@ void tst_QSqlQuery::nextResult()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::MultipleResultSets ) || !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
-        QSKIP( "DBMS does not support multiple result sets or batch operations", SkipSingle );
+        QSKIP( "DBMS does not support multiple result sets or batch operations");
 
     QSqlQuery q( db );
 
     if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
-        QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+        QSKIP( "Test requires MySQL >= 5.0");
 
     enum DriverType { ODBC, MYSQL, DB2 };
     DriverType driverType = ODBC;
@@ -2607,7 +2607,7 @@ void tst_QSqlQuery::blobsPreparedQuery()
     CHECK_DATABASE( db );
 
     if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) || !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
-        QSKIP( "DBMS does not support BLOBs or prepared queries", SkipSingle );
+        QSKIP( "DBMS does not support BLOBs or prepared queries");
 
     const QString tableName(qTableName( "blobstest", __FILE__ ));
 
@@ -2712,7 +2712,7 @@ void tst_QSqlQuery::task_250026()
 
     if ( !q.exec( "create table " + tableName + " (longfield varchar(1100))" ) ) {
         qDebug() << "Error" << q.lastError();
-        QSKIP( "Db doesn't support \"1100\" as a size for fields", SkipSingle );
+        QSKIP( "Db doesn't support \"1100\" as a size for fields");
     }
 
     data258.fill( 'A', 258 );
@@ -2853,7 +2853,7 @@ void tst_QSqlQuery::sqlServerReturn0()
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
     if (!tst_Databases::isSqlServer( db ))
-        QSKIP("SQL Server specific test", SkipSingle);
+        QSKIP("SQL Server specific test");
 
     const QString tableName(qTableName("test141895", __FILE__)), procName(qTableName("test141895_proc", __FILE__));
     QSqlQuery q( db );
@@ -3001,7 +3001,7 @@ void tst_QSqlQuery::QTBUG_6618()
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
     if (!tst_Databases::isSqlServer( db ))
-        QSKIP("SQL Server specific test", SkipSingle);
+        QSKIP("SQL Server specific test");
 
     QSqlQuery q(db);
     q.exec( "drop procedure " + qTableName( "tst_raiseError", __FILE__ ) );  //non-fatal
@@ -3023,7 +3023,7 @@ void tst_QSqlQuery::QTBUG_6852()
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
     if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
-        QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+        QSKIP( "Test requires MySQL >= 5.0");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("bug6852", __FILE__)), procName(qTableName("bug6852_proc", __FILE__));
@@ -3057,7 +3057,7 @@ void tst_QSqlQuery::QTBUG_5765()
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
     if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 1 ).toFloat()<4.1 )
-        QSKIP( "Test requires MySQL >= 4.1", SkipSingle );
+        QSKIP( "Test requires MySQL >= 4.1");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("bug5765", __FILE__));
@@ -3199,7 +3199,7 @@ void tst_QSqlQuery::sqlite_constraint()
     CHECK_DATABASE( db );
 
     if (db.driverName() != QLatin1String("QSQLITE"))
-        QSKIP("Sqlite3 specific test", SkipSingle);
+        QSKIP("Sqlite3 specific test");
 
     QSqlQuery q(db);
     const QString trigger(qTableName("test_constraint", __FILE__));
@@ -3222,7 +3222,7 @@ void tst_QSqlQuery::benchmark()
     QSqlDatabase db = QSqlDatabase::database( dbName );
     CHECK_DATABASE( db );
     if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
-        QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+        QSKIP( "Test requires MySQL >= 5.0");
 
     QSqlQuery q(db);
     const QString tableName(qTableName("benchmark", __FILE__));
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index 79ebc93a80..f14b3d4e93 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -291,9 +291,9 @@ void tst_QSqlThread::generic_data(const QString& engine)
 {
     if ( dbs.fillTestTable(engine) == 0 ) {
         if(engine.isEmpty())
-           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+           QSKIP( "No database drivers are available in this Qt configuration");
         else
-           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
     }
 }
 
@@ -380,7 +380,7 @@ void tst_QSqlThread::simpleThreading()
     CHECK_DATABASE(db);
 
     if (db.databaseName() == ":memory:")
-        QSKIP("does not work with in-memory databases", SkipSingle);
+        QSKIP("does not work with in-memory databases");
 
     QtTestSqlThread t1(db);
     QtTestSqlThread t2(db);
@@ -404,9 +404,9 @@ void tst_QSqlThread::readWriteThreading()
     CHECK_DATABASE(db);
 
     if (db.databaseName() == ":memory:")
-        QSKIP("does not work with in-memory databases", SkipSingle);
+        QSKIP("does not work with in-memory databases");
     else if (tst_Databases::isMSAccess(db))
-        QSKIP("does not work with MS Access databases", SkipSingle);
+        QSKIP("does not work with MS Access databases");
 
     SqlProducer producer(db);
     SqlConsumer consumer(db);
@@ -432,7 +432,7 @@ void tst_QSqlThread::readFromSingleConnection()
     CHECK_DATABASE(db);
 
     if (db.databaseName() == ":memory:")
-        QSKIP("does not work with in-memory databases", SkipSingle);
+        QSKIP("does not work with in-memory databases");
 
     QObject cleanupHelper; // make sure the threads die when we exit the scope
     for (int i = 0; i < maxThreadCount; ++i) {
@@ -454,7 +454,7 @@ void tst_QSqlThread::readWriteFromSingleConnection()
     CHECK_DATABASE(db);
 
     if (db.databaseName() == ":memory:")
-        QSKIP("does not work with in-memory databases", SkipSingle);
+        QSKIP("does not work with in-memory databases");
 
     QObject cleanupHelper;
     for (int i = 0; i < maxThreadCount; ++i) {
@@ -480,7 +480,7 @@ void tst_QSqlThread::preparedReadWriteFromSingleConnection()
     CHECK_DATABASE(db);
 
     if (db.databaseName() == ":memory:")
-        QSKIP("does not work with in-memory databases", SkipSingle);
+        QSKIP("does not work with in-memory databases");
 
     QObject cleanupHelper;
     for (int i = 0; i < maxThreadCount; ++i) {
@@ -506,7 +506,7 @@ void tst_QSqlThread::transactionsFromSingleConnection()
     CHECK_DATABASE(db);
 
     if (db.databaseName() == ":memory:")
-        QSKIP("does not work with in-memory databases", SkipSingle);
+        QSKIP("does not work with in-memory databases");
 
     // start and commit a transaction
     QVERIFY_SQL(db, db.transaction());
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index 25fc893c77..0eebe76049 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -213,9 +213,9 @@ void tst_QSqlQueryModel::generic_data(const QString& engine)
 {
     if ( dbs.fillTestTable(engine) == 0 ) {
         if(engine.isEmpty())
-           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+           QSKIP( "No database drivers are available in this Qt configuration");
         else
-           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
     }
 }
 
@@ -512,7 +512,7 @@ void tst_QSqlQueryModel::withSortFilterProxyModel()
     CHECK_DATABASE(db);
 
     if (db.driver()->hasFeature(QSqlDriver::QuerySize))
-        QSKIP("Test applies only for drivers not reporting the query size.", SkipSingle);
+        QSKIP("Test applies only for drivers not reporting the query size.");
 
     QSqlQueryModel model;
     model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test3", __FILE__), db));
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index 5bfff0dc32..ad94da8e5d 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -103,7 +103,7 @@ void tst_QSqlRelationalTableModel::initTestCase_data()
 {
     dbs.open();
     if (dbs.fillTestTable() == 0)
-        QSKIP("No database drivers are available in this Qt configuration", SkipAll);
+        QSKIP("No database drivers are available in this Qt configuration");
 }
 
 void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db)
@@ -1086,7 +1086,7 @@ void tst_QSqlRelationalTableModel::casing()
     CHECK_DATABASE(db);
 
     if (db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QIBASE") || tst_Databases::isSqlServer(db))
-        QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll);
+        QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities");
 
     QSqlQuery q(db);
     QVERIFY_SQL( q, exec("create table " + qTableName("CASETEST1", db.driver()).toUpper()  +
@@ -1094,7 +1094,7 @@ void tst_QSqlRelationalTableModel::casing()
 
     if( !q.exec("create table " + qTableName("casetest1", db.driver())  +
                 " (ident int not null primary key, name varchar(20), title_key int)"))
-        QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll);
+        QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities");
 
     QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(1, 'harry', 1, 2)"));
     QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(2, 'trond', 2, 1)"));
@@ -1364,7 +1364,7 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers()
     CHECK_DATABASE(db);
 
     if (!testWhiteSpaceNames(db.driverName()))
-        QSKIP("White space test irrelevant for driver", SkipAll);
+        QSKIP("White space test irrelevant for driver");
     QSqlRelationalTableModel model(0, db);
     model.setTable(db.driver()->escapeIdentifier(qTableName("rel", __FILE__)+" test6", QSqlDriver::TableName));
     model.setSort(0, Qt::DescendingOrder);
@@ -1448,7 +1448,7 @@ void tst_QSqlRelationalTableModel::psqlSchemaTest()
     CHECK_DATABASE(db);
 
     if(!tst_Databases::isPostgreSQL(db))
-        QSKIP("Postgresql specific test", SkipSingle);
+        QSKIP("Postgresql specific test");
 
     QSqlRelationalTableModel model(0, db);
     QSqlQuery q(db);
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index 07efd4a3a1..a75a6d459a 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -233,9 +233,9 @@ void tst_QSqlTableModel::generic_data(const QString &engine)
 {
     if ( dbs.fillTestTable(engine) == 0 ) {
         if (engine.isEmpty())
-           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+           QSKIP( "No database drivers are available in this Qt configuration");
         else
-           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
     }
 }
 
@@ -243,9 +243,9 @@ void tst_QSqlTableModel::generic_data_with_strategies(const QString &engine)
 {
     if ( dbs.fillTestTableWithStrategies(engine) == 0 ) {
         if (engine.isEmpty())
-           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+           QSKIP( "No database drivers are available in this Qt configuration");
         else
-           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
     }
 }
 
@@ -961,7 +961,7 @@ void tst_QSqlTableModel::whitespaceInIdentifiers()
     CHECK_DATABASE(db);
 
     if (!testWhiteSpaceNames(db.driverName()))
-        QSKIP("DBMS doesn't support whitespaces in identifiers", SkipSingle);
+        QSKIP("DBMS doesn't support whitespaces in identifiers");
 
     QString tableName = qTableName("qtestw hitespace", db.driver());
 
@@ -1221,7 +1221,7 @@ void tst_QSqlTableModel::sqlite_attachedDatabase()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
     if(db.databaseName() == ":memory:")
-        QSKIP(":memory: database, skipping test", SkipSingle);
+        QSKIP(":memory: database, skipping test");
 
     QSqlDatabase attachedDb = QSqlDatabase::cloneDatabase(db, db.driverName() + QLatin1String("attached"));
     attachedDb.setDatabaseName(db.databaseName()+QLatin1String("attached.dat"));