diff -r b72c6db6890b -r 5dc02b23752f src/sql/drivers/db2/qsql_db2.cpp --- a/src/sql/drivers/db2/qsql_db2.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/sql/drivers/db2/qsql_db2.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -109,7 +109,7 @@ static QString qFromTChar(SQLTCHAR* str) { - return QString::fromUtf16(str); + return QString((const QChar *)str); } // dangerous!! (but fast). Don't use in functions that @@ -833,7 +833,7 @@ break; case QVariant::String: if (bindValueType(i) & QSql::Out) - values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData()); + values[i] = QString((const QChar *)tmpStorage.takeFirst().constData()); break; default: { values[i] = QString::fromAscii(tmpStorage.takeFirst().constData());