diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 10 | ||||
| -rw-r--r-- | tests/auto/dlt/dlt.pro | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 75ccd6a..561f32b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,9 +1,5 @@ TEMPLATE = subdirs -!geniviextras-only { - SUBDIRS = core vehiclefunctions -} - -config_dlt { - SUBDIRS += dlt -} +qtHaveModule(ivicore): SUBDIRS += core +qtHaveModule(ivivehiclefunctions): SUBDIRS += vehiclefunctions +qtHaveModule(geniviextras): SUBDIRS += dlt diff --git a/tests/auto/dlt/dlt.pro b/tests/auto/dlt/dlt.pro index feb04bc..8467358 100644 --- a/tests/auto/dlt/dlt.pro +++ b/tests/auto/dlt/dlt.pro @@ -1,15 +1,9 @@ QT += testlib geniviextras TARGET = tst_dlt -CONFIG += testcase link_pkgconfig +CONFIG += testcase -DLT_LIB_PATH = $$system($$pkgConfigExecutable() --variable=libdir automotive-dlt) -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += automotive-dlt - QMAKE_RPATH += $$DLT_LIB_PATH -} else { - LIBS += -ldlt -} +QMAKE_USE += dlt TEMPLATE = app |