diff options
| author | Bill King <bill.king@nokia.com> | 2009-05-28 01:12:26 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-05-28 01:12:26 (GMT) |
| commit | 8aef511877d460e4d7e75c978142f1ca3bd50451 (patch) | |
| tree | 78362c8a123dce23991f0d6e0200db4e13278650 /src/plugins/sqldrivers | |
| parent | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (diff) | |
| download | Qt-8aef511877d460e4d7e75c978142f1ca3bd50451.zip Qt-8aef511877d460e4d7e75c978142f1ca3bd50451.tar.gz Qt-8aef511877d460e4d7e75c978142f1ca3bd50451.tar.bz2 | |
Adds support for linking against iodbc on linux.
If unixodbc detection fails, try and link/detect iodbc libraries and link against them.
Reviewed-by: Lincoln Ramsay
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/odbc/odbc.pro | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro index 0835ce1..3de8ab2 100644 --- a/src/plugins/sqldrivers/odbc/odbc.pro +++ b/src/plugins/sqldrivers/odbc/odbc.pro @@ -4,15 +4,9 @@ HEADERS = ../../../sql/drivers/odbc/qsql_odbc.h SOURCES = main.cpp \ ../../../sql/drivers/odbc/qsql_odbc.cpp -mac { - !contains( LIBS, .*odbc.* ) { - LIBS *= -liodbc - } -} - unix { !contains( LIBS, .*odbc.* ) { - LIBS *= -lodbc + LIBS *= $$QT_LFLAGS_ODBC } } |