diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 05:26:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 05:26:21 (GMT) |
| commit | 180fdc19835d38962ada5e6d76f7c928082b6ebc (patch) | |
| tree | 1eb99ba395692a6e061b5877e751bc0fb03b5694 | |
| parent | a8b9a698afbbfb837779fe94066d39e4cbd0d1dd (diff) | |
| parent | 67ddb9cca2b638b1cf71eb98e906260b83a38677 (diff) | |
| download | Qt-180fdc19835d38962ada5e6d76f7c928082b6ebc.zip Qt-180fdc19835d38962ada5e6d76f7c928082b6ebc.tar.gz Qt-180fdc19835d38962ada5e6d76f7c928082b6ebc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the broken unicode detection of ODBC driver.
| -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; } } |