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

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"));