From b2d61c982e860a532f931dfaea143749927784a6 Mon Sep 17 00:00:00 2001
From: Derick Hawcroft <derick.hawcroft@nokia.com>
Date: Wed, 1 Jul 2009 08:49:22 +1000
Subject: 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
---
 src/sql/drivers/odbc/qsql_odbc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 2bedf7f..e18a9eb 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:
             {
-- 
cgit v0.12