diff -r b72c6db6890b -r 5dc02b23752f src/sql/drivers/sqlite/qsql_sqlite.cpp --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -95,7 +95,7 @@ int errorCode = -1) { return QSqlError(descr, - QString::fromUtf16(static_cast(sqlite3_errmsg16(access))), + QString(reinterpret_cast(sqlite3_errmsg16(access))), type, errorCode); } @@ -162,13 +162,13 @@ q->init(nCols); for (int i = 0; i < nCols; ++i) { - QString colName = QString::fromUtf16( - static_cast(sqlite3_column_name16(stmt, i)) + QString colName = QString(reinterpret_cast( + sqlite3_column_name16(stmt, i)) ).remove(QLatin1Char('"')); // must use typeName for resolving the type to match QSqliteDriver::record - QString typeName = QString::fromUtf16( - static_cast(sqlite3_column_decltype16(stmt, i))); + QString typeName = QString(reinterpret_cast( + sqlite3_column_decltype16(stmt, i))); int dotIdx = colName.lastIndexOf(QLatin1Char('.')); QSqlField fld(colName.mid(dotIdx == -1 ? 0 : dotIdx + 1), qGetColumnType(typeName));