diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-12 20:19:33 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:26:43 +0000 |
| commit | 4b288e30efda67212b54d7f2e084d0f3acc594ae (patch) | |
| tree | 80c91ddce64731a15d208e0ba9dfdc0f99b2029b /src/plugins/sqldrivers | |
| parent | d5dc46d319bb1f58f8a0ba64d2ef270eecbe8e65 (diff) | |
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 <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/db2/db2.pro | 6 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/ibase/ibase.pro | 9 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/oci/oci.pro | 7 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite2/sqlite2.pro | 2 |
4 files changed, 6 insertions, 18 deletions
diff --git a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro index 31822ef8dc..eef65fac66 100644 --- a/src/plugins/sqldrivers/db2/db2.pro +++ b/src/plugins/sqldrivers/db2/db2.pro @@ -3,11 +3,7 @@ TARGET = qsqldb2 HEADERS += $$PWD/qsql_db2_p.h SOURCES += $$PWD/qsql_db2.cpp $$PWD/main.cpp -unix { - !contains(LIBS, .*db2.*):LIBS += -ldb2 -} else { - !contains(LIBS, .*db2.*):LIBS += -ldb2cli -} +QMAKE_USE += db2 OTHER_FILES += db2.json diff --git a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro index 8237245183..e5709207d1 100644 --- a/src/plugins/sqldrivers/ibase/ibase.pro +++ b/src/plugins/sqldrivers/ibase/ibase.pro @@ -3,13 +3,8 @@ TARGET = qsqlibase HEADERS += $$PWD/qsql_ibase_p.h SOURCES += $$PWD/qsql_ibase.cpp $$PWD/main.cpp -unix { - !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds -} else { - !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) { - LIBS += -lgds32_ms - } -} +# FIXME: ignores libfb (unix)/fbclient (win32) - but that's for the test anyway +QMAKE_USE += ibase OTHER_FILES += ibase.json 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 diff --git a/src/plugins/sqldrivers/sqlite2/sqlite2.pro b/src/plugins/sqldrivers/sqlite2/sqlite2.pro index d0ab0eef41..721facb5b8 100644 --- a/src/plugins/sqldrivers/sqlite2/sqlite2.pro +++ b/src/plugins/sqldrivers/sqlite2/sqlite2.pro @@ -3,7 +3,7 @@ TARGET = qsqlite2 HEADERS += $$PWD/qsql_sqlite2_p.h SOURCES += $$PWD/qsql_sqlite2.cpp $$PWD/smain.cpp -!contains(LIBS, .*sqlite.*):LIBS += -lsqlite +QMAKE_USE += sqlite2 OTHER_FILES += sqlite2.json |