diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-02 09:42:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-02 09:42:08 (GMT) |
| commit | c1283842567eea7dd83147a4bea5cd01564fdc2b (patch) | |
| tree | b673a439cab0a88120dbb11ed082588828697081 | |
| parent | cd4901b1e3a545d025628e881a143b8f240d2690 (diff) | |
| parent | 70137e0601549af1056082cdfbb4f141c70befab (diff) | |
| download | Qt-c1283842567eea7dd83147a4bea5cd01564fdc2b.zip Qt-c1283842567eea7dd83147a4bea5cd01564fdc2b.tar.gz Qt-c1283842567eea7dd83147a4bea5cd01564fdc2b.tar.bz2 | |
Merge branch '4.5'
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 | ||||
| -rw-r--r-- | util/unicode/main.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index c48c7cd..39565d3 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1111,7 +1111,7 @@ QVariant QODBCResult::data(int field) d->fieldCache[i] = qGetBinaryData(d->hStmt, i); break; case QVariant::String: - d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), true); + d->fieldCache[i] = qGetStringData(d->hStmt, i, info.length(), d->unicode); break; case QVariant::Double: switch(numericalPrecisionPolicy()) { diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index cab6570..f1b4641 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -293,6 +293,7 @@ struct PropertyFlags { && lowerCaseDiff == o.lowerCaseDiff && upperCaseDiff == o.upperCaseDiff && titleCaseDiff == o.titleCaseDiff + && caseFoldDiff == o.caseFoldDiff && lowerCaseSpecial == o.lowerCaseSpecial && upperCaseSpecial == o.upperCaseSpecial && titleCaseSpecial == o.titleCaseSpecial |