From 413b40eaf7911bc28671afa5997ceca58af36b29 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 7 Oct 2011 11:42:28 +1000 Subject: [PATCH] Remove redundant qWarning's. The removed warnings just repeat information that is already in the QSKIP's that immediately follow the warnings. Change-Id: Id13158487e8075aab8a8f48955303edde3f4af63 Reviewed-on: http://codereview.qt-project.org/6194 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp | 4 +--- .../models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp index 6e47c24..bb77eeb 100644 --- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp @@ -75,10 +75,8 @@ private slots: void tst_QSqlDriver::initTestCase_data() { dbs.open(); - if (dbs.fillTestTable() == 0) { - qWarning("NO DATABASES"); + if (dbs.fillTestTable() == 0) QSKIP("No database drivers are available in this Qt configuration", SkipAll); - } } void tst_QSqlDriver::recreateTestTables(QSqlDatabase db) diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index c133b8e..5bfff0d 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -102,10 +102,8 @@ private: void tst_QSqlRelationalTableModel::initTestCase_data() { dbs.open(); - if (dbs.fillTestTable() == 0) { - qWarning("NO DATABASES"); + if (dbs.fillTestTable() == 0) QSKIP("No database drivers are available in this Qt configuration", SkipAll); - } } void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db) -- 2.7.4