summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorDerick Hawcroft <derick.hawcroft@nokia.com>2009-07-01 08:49:22 +1000
committerDerick Hawcroft <derick.hawcroft@nokia.com>2009-07-01 08:54:42 +1000
commitb2d61c982e860a532f931dfaea143749927784a6 (patch)
treed292ecd470b29657d037c9acb66b017aa5ad6260 /src/sql
parentcd796aa6dcdf83fa50ced56a9885835fda851a09 (diff)
Don assume QVariant::String data is going to always be unicode in QODBC
- as was not the case for the psqlODBC driver Reviewed-by: Bill King
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 2bedf7f0fb..e18a9ebce9 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1006,7 +1006,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:
{