summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2010-03-25 06:44:32 (GMT)
committerBill King <bill.king@nokia.com>2010-03-25 06:44:32 (GMT)
commit194bbeed0152d541527059bb0f1dae60a8573912 (patch)
treec550d51468e6f47fc6c60e1a97b3a72be818ac2e
parent9c4bfd1dbdda1a073be12cf6212492abc7e9472b (diff)
downloadQt-194bbeed0152d541527059bb0f1dae60a8573912.zip
Qt-194bbeed0152d541527059bb0f1dae60a8573912.tar.gz
Qt-194bbeed0152d541527059bb0f1dae60a8573912.tar.bz2
Fix ODBC compilation for ODBC versions < 3.5
Task-number: QTBUG-8488 Reviewed-by: Justin McPherson
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 1506c3c..f41a914 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -352,7 +352,9 @@ static QVariant::Type qDecodeODBCType(SQLSMALLINT sqltype, const T* p, bool isSi
#endif
case SQL_CHAR:
case SQL_VARCHAR:
+#if (ODBCVER >= 0x0350)
case SQL_GUID:
+#endif
case SQL_LONGVARCHAR:
type = QVariant::String;
break;