diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-13 15:27:52 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-20 19:02:00 +0200 |
| commit | 3f779ee8e61220bd26c14a69c03f6ebb6281dad4 (patch) | |
| tree | eede79995ef7aa8b782d6374dd60544d1c6c526b | |
| parent | 909c3cb760886a1c879a94938b5b9590a3d0bdff (diff) | |
| download | qt3-3f779ee8e61220bd26c14a69c03f6ebb6281dad4.tar.gz qt3-3f779ee8e61220bd26c14a69c03f6ebb6281dad4.zip | |
Use unixODBC instead of obsolete iODBC
This closes Bug 792
Thanks to 'L0ner' for the patch!
(cherry picked from commit e20b43430837963d47b87d290be7a0996182c8a9)
| -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 ac0cf3c..36d35b5 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 b09afd2..8b0b58b 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 QSQLLEN SQLLEN #else # define QSQLLEN SQLINTEGER #endif -#ifdef SQLULEN +#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) # define QSQLULEN SQLULEN #else # define QSQLULEN SQLUINTEGER #endif - static const QSQLLEN COLNAMESIZE = 256; //Map Qt 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 5533c6f..17a6d40 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 } } |