diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 12:53:13 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 01:20:29 +0200 |
commit | 27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch) | |
tree | 3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp | |
parent | 016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff) |
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>
Diffstat (limited to 'tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp')
-rw-r--r-- | tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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")); |