From 9e18b1b2f8b319a41a8fc967e119156be4d8ae7b Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 1 Feb 2017 11:44:38 +0100 Subject: 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 --- examples/examples.pro | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/examples.pro b/examples/examples.pro index a3bc472..e689d54 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,9 +1,5 @@ TEMPLATE = subdirs -!geniviextras-only { - SUBDIRS = vehiclefunctions \ - media -} -config_dlt { - SUBDIRS += geniviextras -} +qtHaveModule(ivivehiclefunctions): SUBDIRS += vehiclefunctions +qtHaveModule(ivimedia): SUBDIRS += media +qtHaveModule(geniviextras): SUBDIRS += geniviextras -- cgit v1.2.1