diff options
| author | Charles Yin <charles.yin@nokia.com> | 2010-08-24 05:15:29 (GMT) |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2011-06-09 10:06:46 (GMT) |
| commit | 7ea82acb7694b5791d9476def0a33868599b3fbc (patch) | |
| tree | 5a3eb71befd46ffc17162ecc47fbd81d873db20a | |
| parent | 6d50be755ebaf11b794dc59cfda6dabb302d1a17 (diff) | |
| download | Qt-7ea82acb7694b5791d9476def0a33868599b3fbc.zip Qt-7ea82acb7694b5791d9476def0a33868599b3fbc.tar.gz Qt-7ea82acb7694b5791d9476def0a33868599b3fbc.tar.bz2 | |
Fix the broken unicode detection of ODBC driver.
the unicode flag is entirely overrided by mistake.
Task-number:QTBUG-13109
Reviewed-by:Michael Goddard
(cherry picked from commit 67ddb9cca2b638b1cf71eb98e906260b83a38677)
| -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 2737b16..bb77784 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -2132,7 +2132,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; } } |