From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: 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 --- tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/sql/models/qsqlquerymodel') 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)); -- cgit v1.2.3