summaryrefslogtreecommitdiffstats
path: root/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch')
m---------gentoo0
-rw-r--r--gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch59
2 files changed, 0 insertions, 59 deletions
diff --git a/gentoo b/gentoo
new file mode 160000
+Subproject 644110a847c5911c2eb04eb53c93031740561ef
diff --git a/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch b/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch
deleted file mode 100644
index 278aec438..000000000
--- a/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
- }
- }
-