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-25 04:45:59 (GMT) |
| commit | 398afe929efb1a6aaaa353c2e3e42d9049cc0140 (patch) | |
| tree | f76bb916a7a4c5611bc5ccc011638ab63f140cbf /src | |
| parent | a60940d89cf7bf075e5b1f2055d63477d1187125 (diff) | |
| download | Qt-398afe929efb1a6aaaa353c2e3e42d9049cc0140.zip Qt-398afe929efb1a6aaaa353c2e3e42d9049cc0140.tar.gz Qt-398afe929efb1a6aaaa353c2e3e42d9049cc0140.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')
| -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 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; } } |