diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-07 23:53:17 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-07 23:53:17 (GMT) |
| commit | ac33de5bf257eb215a09c232d950be265d57d22f (patch) | |
| tree | 3947891872c1a41deaa32e8995e2e233548b3352 /src/sql/drivers/sqlite/qsql_sqlite.cpp | |
| parent | 3108f02f35685bd57486e198277c600e09d98b13 (diff) | |
| parent | 8ca95cbc98a97a8208120e4aa76bfd5c16b01df9 (diff) | |
| download | Qt-ac33de5bf257eb215a09c232d950be265d57d22f.zip Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.gz Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Diffstat (limited to 'src/sql/drivers/sqlite/qsql_sqlite.cpp')
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 9dbefaf..9fff552 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -245,9 +245,9 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i values[i + idx] = QVariant(QVariant::String); break; default: - values[i + idx] = QString::fromUtf16(static_cast<const ushort *>( + values[i + idx] = QString(reinterpret_cast<const QChar *>( sqlite3_column_text16(stmt, i)), - sqlite3_column_bytes16(stmt, i) / sizeof(ushort)); + sqlite3_column_bytes16(stmt, i) / sizeof(QChar)); break; } } |