diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-02-01 11:44:38 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-02-01 13:18:49 +0000 |
| commit | 27e3782290814e2bd44fd314eba91fa848ab756f (patch) | |
| tree | 8b97ff2e0146f51e77a58347c198e86205e79efb /examples/examples.pro | |
| parent | 98e3e325073e0f64a244cbded59b7452a240bef2 (diff) | |
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 'examples/examples.pro')
| -rw-r--r-- | examples/examples.pro | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index a3bc4725..e689d54a 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 |