Automated update from Qt3

12 years ago · f27c2533f7
parent e6ee551961
commit f27c2533f7
3 changed files with 5 additions and 6 deletions
--- a/plugins/src/sqldrivers/odbc/odbc.pro
+++ b/plugins/src/sqldrivers/odbc/odbc.pro
@ -17,7 +17,7 @@ mac {
 unix {
 	OBJECTS_DIR	= .obj
 	!contains( LIBS, .*odbc.* ) {
-	    LIBS 	*= -liodbc
+	    LIBS 	*= -lodbc
 	}
 }

--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@ -61,19 +61,18 @@
 #endif

 // newer platform SDKs use SQLLEN instead of SQLINTEGER
-#ifdef SQLLEN
+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
 # define TQSQLLEN SQLLEN
 #else
 # define TQSQLLEN SQLINTEGER
 #endif

-#ifdef SQLULEN
+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
 # define TQSQLULEN SQLULEN
 #else
 # define TQSQLULEN SQLUINTEGER
 #endif

-
 static const TQSQLLEN COLNAMESIZE = 256;
 //Map TQt parameter types to ODBC types
 static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT };
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
@ -110,13 +110,13 @@ sql {

 		mac {
 			!contains( LIBS, .*odbc.* ) {
-				LIBS        *= -liodbc
+				LIBS        *= -lodbc
 			}
 		}

 		unix {
 			!contains( LIBS, .*odbc.* ) {
-				LIBS        *= -liodbc
+				LIBS        *= -lodbc
 			}
 		}