summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-02-01 11:44:38 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-02-01 13:18:49 +0000
commit9e18b1b2f8b319a41a8fc967e119156be4d8ae7b (patch)
tree47d4dd880079399df7c8664492a57e503d3dff2c /config.tests
parent54e452dc1b7f7db8a2c0e1cd5699e3097244e9a9 (diff)
downloadqtivi-9e18b1b2f8b319a41a8fc967e119156be4d8ae7b.tar.gz
Move qtivi over to the new config system
Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. The geniviextras-only CONFIG option has now been replaced with a command-line option and can be used by passing it to qmake after '--'. E.g. 'qmake -- --geniviextras-only'. Removed adding DLT into the rpath. Similar to all other Qt modules, it is now expected that packages found using pkg-config can be found by the dynamic linker. Change-Id: If46cd1b79413cd7571ee1068898848d9871e61ba Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/dlt/dlt.pro11
-rw-r--r--config.tests/taglib/taglib.pro11
2 files changed, 0 insertions, 22 deletions
diff --git a/config.tests/dlt/dlt.pro b/config.tests/dlt/dlt.pro
index b8f0208..28dcadc 100644
--- a/config.tests/dlt/dlt.pro
+++ b/config.tests/dlt/dlt.pro
@@ -1,12 +1 @@
-TARGET = dlt
-QT = core
-
-!contains(QT_CONFIG, no-pkg-config) {
- CONFIG += link_pkgconfig
- PKGCONFIG += automotive-dlt
-} else {
- LIBS += -ldlt
-}
-
-# Input
SOURCES += main.cpp
diff --git a/config.tests/taglib/taglib.pro b/config.tests/taglib/taglib.pro
index 563372f..28dcadc 100644
--- a/config.tests/taglib/taglib.pro
+++ b/config.tests/taglib/taglib.pro
@@ -1,12 +1 @@
-TARGET = taglib
-QT = core
-
-!contains(QT_CONFIG, no-pkg-config) {
- CONFIG += link_pkgconfig
- PKGCONFIG += taglib
-} else {
- LIBS += -ltag
-}
-
-# Input
SOURCES += main.cpp