summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsqldatabase
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-05-19 16:19:01 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-05-19 16:20:08 +0200
commit49995ee35ff0b26e32303d77df619d3a2fbcb86b (patch)
tree59cac159b76d07a407149870a9f469251d99ac5c /tests/auto/qsqldatabase
parenta98ebc599ab7c99a6431d0420d3f0d238f37f6b1 (diff)
Tests: Fix some compile warnings.
As they are now compiled by default.
Diffstat (limited to 'tests/auto/qsqldatabase')
-rw-r--r--tests/auto/qsqldatabase/tst_qsqldatabase.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index 900eab7161..96ea3d95d7 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -212,7 +212,6 @@ private:
// number of records to be inserted per testfunction
static const int ITERATION_COUNT = 2;
-static int pkey = 1;
//helper class for database specific tests
struct FieldDef {
@@ -483,8 +482,9 @@ void tst_QSqlDatabase::tables()
if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) {
- qDebug(QString("DBMS '%1' cannot handle VIEWs: %2").arg(
- tst_Databases::dbToString(db)).arg(QString(tst_Databases::printError(q.lastError()))).toLatin1());
+ qDebug("DBMS '%s' cannot handle VIEWs: %s",
+ qPrintable(tst_Databases::dbToString(db)),
+ qPrintable(tst_Databases::printError(q.lastError())));
views = false;
}
@@ -1080,7 +1080,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")) {
- qDebug("MySQL: " + tst_Databases::printError(db.lastError()));
+ qDebug("MySQL: %s", qPrintable(tst_Databases::printError(db.lastError())));
QSKIP("MySQL transaction failed ", SkipSingle); //non-fatal
} else {
QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError()));
@@ -1861,7 +1861,7 @@ void tst_QSqlDatabase::oci_serverDetach()
}
}
if(!db.open())
- qFatal(tst_Databases::printError(db.lastError(), db));
+ qFatal("%s", qPrintable(tst_Databases::printError(db.lastError(), db)));
}
void tst_QSqlDatabase::oci_xmltypeSupport()