From 8aef511877d460e4d7e75c978142f1ca3bd50451 Mon Sep 17 00:00:00 2001 From: Bill King Date: Thu, 28 May 2009 11:12:26 +1000 Subject: 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 --- src/plugins/sqldrivers/odbc/odbc.pro | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/plugins/sqldrivers') diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro index 0835ce134a..3de8ab2086 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 } } -- cgit v1.2.3