diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 06:01:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 06:01:28 (GMT) |
| commit | 0cd82fc6a7f2e28b46201b0870b246f8a69127fa (patch) | |
| tree | 2cb22ace11488eeb5e99ab9e4199dedb7818efa0 /src | |
| parent | 8d8566d061e26f18e1bde1255fdc1375035c8eaa (diff) | |
| parent | 3a51462bfb3cca8c90e1c690cf045b371d2ab393 (diff) | |
| download | Qt-0cd82fc6a7f2e28b46201b0870b246f8a69127fa.zip Qt-0cd82fc6a7f2e28b46201b0870b246f8a69127fa.tar.gz Qt-0cd82fc6a7f2e28b46201b0870b246f8a69127fa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes the Oracle invalid date bug when date is greater or equal to 2800
Diffstat (limited to 'src')
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index 2f0cfdc..c56b995 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -648,7 +648,7 @@ QByteArray qMakeOraDate(const QDateTime& dt) QDateTime qMakeDate(const char* oraDate) { - int century = oraDate[0]; + int century = uchar(oraDate[0]); if(century >= 100){ int year = uchar(oraDate[1]); year = ((century-100)*100) + (year-100); |