diff options
| author | Peter Yard <peter.yard@nokia.com> | 2009-10-19 05:36:16 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2009-10-19 05:36:16 (GMT) |
| commit | 889d80e7383c1f95af64fda0dc19feef1ebf034b (patch) | |
| tree | 3cdab36121224b72ecf1f99b3017f94ff312c039 | |
| parent | e05137fe501e9536e15b1980c936af771e9518db (diff) | |
| parent | c3bab81d5966c9bd3a42d9c5cbb9d8ad35a1b330 (diff) | |
| download | Qt-889d80e7383c1f95af64fda0dc19feef1ebf034b.zip Qt-889d80e7383c1f95af64fda0dc19feef1ebf034b.tar.gz Qt-889d80e7383c1f95af64fda0dc19feef1ebf034b.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index ff9458b..e686873 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1455,7 +1455,7 @@ bool QODBCResult::exec() else #endif { - QByteArray str = val.toString().toUtf8(); + QByteArray str = val.toString().toAscii(); if (*ind != SQL_NULL_DATA) *ind = str.length(); int strSize = str.length(); |