summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-02 09:42:08 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-02 09:42:08 (GMT)
commitc1283842567eea7dd83147a4bea5cd01564fdc2b (patch)
treeb673a439cab0a88120dbb11ed082588828697081 /src/sql
parentcd4901b1e3a545d025628e881a143b8f240d2690 (diff)
parent70137e0601549af1056082cdfbb4f141c70befab (diff)
downloadQt-c1283842567eea7dd83147a4bea5cd01564fdc2b.zip
Qt-c1283842567eea7dd83147a4bea5cd01564fdc2b.tar.gz
Qt-c1283842567eea7dd83147a4bea5cd01564fdc2b.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.cpp2
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 c48c7cd..39565d3 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1111,7 +1111,7 @@ QVariant QODBCResult::data(int field)
d->fieldCache[i] = qGetBinaryData(d->hStmt, i);
break;
case QVariant::String:
- d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), true);
+ d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), d->unicode);
break;
case QVariant::Double:
switch(numericalPrecisionPolicy()) {