diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
| tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qsqlquery/tst_qsqlquery.cpp | |
| parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
| parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qsqlquery/tst_qsqlquery.cpp')
| -rw-r--r-- | tests/auto/qsqlquery/tst_qsqlquery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index be2087dfc8..eb7ae9184e 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -1558,7 +1558,7 @@ void tst_QSqlQuery::transaction() if ( !q.exec( "rollback" ) ) { if ( db.driverName().startsWith( "QMYSQL" ) ) { - qDebug( "MySQL: " + tst_Databases::printError( q.lastError() ) ); + qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) )); QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal } else QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) ); @@ -1578,8 +1578,8 @@ void tst_QSqlQuery::transaction() QVERIFY_SQL( q2, exec( "select * from" + qtest + " where id = 42" ) ); if ( q2.next() ) - qDebug( QString( "DBMS '%1' doesn't support query based transactions with concurrent access" ).arg( - tst_Databases::dbToString( db ) ).toLatin1() ); + qDebug("DBMS '%s' doesn't support query based transactions with concurrent access", + qPrintable(tst_Databases::dbToString( db ))); QVERIFY_SQL( q, exec( "commit" ) ); |