diff options
| author | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
| commit | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (patch) | |
| tree | 2d17f5a85f6bc38e1dd80d3ea09800aff0af29b0 /src/sql/drivers/sqlite/qsql_sqlite.cpp | |
| parent | 76bcd00f74b0977b5f6ce12295aae987ea9ad4c1 (diff) | |
| parent | fd30747b5b54a760ca280ad1e75ce87026478f5e (diff) | |
| download | Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.zip Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.gz Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
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; } } |