diff options
| author | Timothy Pearson <[email protected]> | 2012-06-13 15:30:09 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-06-13 15:30:09 -0500 |
| commit | f27c2533f735d53c6b555f387c6390c0690cc246 (patch) | |
| tree | d5dc456dfb009f3782f8692ae94001934fabb7ac | |
| parent | e6ee551961ae3e251b448264c948036de9f6c760 (diff) | |
| download | tqt3-f27c2533f735d53c6b555f387c6390c0690cc246.tar.gz tqt3-f27c2533f735d53c6b555f387c6390c0690cc246.zip | |
Automated update from Qt3
| -rw-r--r-- | plugins/src/sqldrivers/odbc/odbc.pro | 2 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 5 | ||||
| -rw-r--r-- | src/sql/qt_sql.pri | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/plugins/src/sqldrivers/odbc/odbc.pro b/plugins/src/sqldrivers/odbc/odbc.pro index ac0cf3c50..36d35b51c 100644 --- 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 } } diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index f1c9e8da7..cfe4d337f 100644 --- 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 }; diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri index 6856b5730..f5bd94872 100644 --- 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 } } |