From 4b288e30efda67212b54d7f2e084d0f3acc594ae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Aug 2016 20:19:33 +0200 Subject: employ QMAKE_USE: LIBS += -lfoo this switches all instances of LIBS[_PRIVATE] += -lfoo where a config tests exists for foo. this removes some code duplication between tests and project files (in case of conditionals), and ensures that the projects always actually use the libraries configure has found. Change-Id: Ia7e80c8db5f329290c7f1a4e03a8bf78882a687e Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/plugins/sqldrivers/oci/oci.pro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/plugins/sqldrivers/oci') diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro index a22d1181bf..e6ef71f20f 100644 --- a/src/plugins/sqldrivers/oci/oci.pro +++ b/src/plugins/sqldrivers/oci/oci.pro @@ -3,11 +3,8 @@ TARGET = qsqloci HEADERS += $$PWD/qsql_oci_p.h SOURCES += $$PWD/qsql_oci.cpp $$PWD/main.cpp -unix { - !contains(LIBS, .*clnts.*):LIBS += -lclntsh -} else { - LIBS *= -loci -} +QMAKE_USE += oci + darwin:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ OTHER_FILES += oci.json -- cgit v1.2.3