From d5dc46d319bb1f58f8a0ba64d2ef270eecbe8e65 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 13 Aug 2016 21:38:19 +0200 Subject: employ QMAKE_USE: LIBS += $$QMAKE_LIBS_FOO this migrates the cases where the build system already made (some) use of variables (possibly) set by configure. Change-Id: I43a08caed481d5f887a3a40821e71a4797760e7e Reviewed-by: Lars Knoll --- src/plugins/sqldrivers/odbc/odbc.pro | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/plugins/sqldrivers/odbc/odbc.pro') diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro index 0e49f1ac66..17844f27d2 100644 --- a/src/plugins/sqldrivers/odbc/odbc.pro +++ b/src/plugins/sqldrivers/odbc/odbc.pro @@ -3,15 +3,8 @@ TARGET = qsqlodbc HEADERS += $$PWD/qsql_odbc_p.h SOURCES += $$PWD/qsql_odbc.cpp $$PWD/main.cpp -unix { - DEFINES += UNICODE - !contains(LIBS, .*odbc.*) { - osx:LIBS += -liodbc - else:LIBS += $$QMAKE_LIBS_ODBC - } -} else { - LIBS *= -lodbc32 -} +QMAKE_USE += odbc +unix: DEFINES += UNICODE OTHER_FILES += odbc.json -- cgit v1.2.3