diff options
| author | Charles Yin <charles.yin@nokia.com> | 2010-08-24 05:15:29 (GMT) |
|---|---|---|
| committer | Charles Yin <charles.yin@nokia.com> | 2010-08-24 05:15:29 (GMT) |
| commit | 67ddb9cca2b638b1cf71eb98e906260b83a38677 (patch) | |
| tree | 1eb99ba395692a6e061b5877e751bc0fb03b5694 /src/sql/drivers/odbc/qsql_odbc.cpp | |
| parent | a8b9a698afbbfb837779fe94066d39e4cbd0d1dd (diff) | |
| download | Qt-67ddb9cca2b638b1cf71eb98e906260b83a38677.zip Qt-67ddb9cca2b638b1cf71eb98e906260b83a38677.tar.gz Qt-67ddb9cca2b638b1cf71eb98e906260b83a38677.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
Diffstat (limited to 'src/sql/drivers/odbc/qsql_odbc.cpp')
| -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 f41a914..b06970c 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; } } |