diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-30 00:33:37 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-30 00:33:37 (GMT) |
| commit | 96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c (patch) | |
| tree | 6e8f0b0b125d0f03529cb0fb07f686d34c6b7daf /src/sql/kernel/qsqldatabase.cpp | |
| parent | 829833e16644beab6077d07ad80f3a2b148f4e41 (diff) | |
| parent | 597a842d66dc04181bfd063863216acbb11ce3bc (diff) | |
| download | Qt-96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c.zip Qt-96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c.tar.gz Qt-96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 76bc2b0..2ab37de 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -60,7 +60,10 @@ #include "../drivers/oci/qsql_oci.h" #endif #ifdef QT_SQL_TDS +// conflicting RETCODE typedef between odbc and freetds +#define RETCODE DBRETCODE #include "../drivers/tds/qsql_tds.h" +#undef RETCODE #endif #ifdef QT_SQL_DB2 #include "../drivers/db2/qsql_db2.h" |