From 398afe929efb1a6aaaa353c2e3e42d9049cc0140 Mon Sep 17 00:00:00 2001
From: Charles Yin <charles.yin@nokia.com>
Date: Tue, 24 Aug 2010 15:15:29 +1000
Subject: Fix the broken unicode detection of ODBC driver. the unicode flag is
 entirely overrided by mistake.

Task-number:QTBUG-13109
Reviewed-by:Michael Goddard
---
 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 9a35ac5..66dabfa 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -2106,7 +2106,7 @@ void QODBCDriverPrivate::checkSqlServer()
         serverType = QString::fromUtf8((const char *)serverString.constData(), t);
 #endif
         isFreeTDSDriver = serverType.contains(QLatin1String("tdsodbc"), Qt::CaseInsensitive);
-        unicode = isFreeTDSDriver == false;
+        unicode = unicode && !isFreeTDSDriver;
     }
 }
 
-- 
cgit v0.12