diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-07 10:24:11 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-12 08:04:22 +0000 |
| commit | 63735a02e20f6b3b238b0b707794332054814db6 (patch) | |
| tree | 81a90b6604bc8559531e1ff89899b94fb1d96a77 /mkspecs | |
| parent | a830a6852afd323870f8d88b5494e1a029ab05db (diff) | |
| download | qtivi-63735a02e20f6b3b238b0b707794332054814db6.tar.gz | |
ivigenerator: respect -system-ivigenerator
Don't use the internal ivigenerator when -system-ivigenerator
option is enabled, as is done in yocto builds.
Change-Id: Ic22c2bba0214041618ef4c157056a3638235ec97
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index b2af78e..65c497e 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -8,6 +8,7 @@ # QFACE_FORMAT = frontend (or backend, simulator... -- defaults to "frontend") # QFACE_OUTPUT_DIR = my_output_dir (defaults to current build dir) # +QT_FOR_CONFIG += ivicore-private isEmpty(QFACE_FORMAT): QFACE_FORMAT = frontend isEmpty(QFACE_OUTPUT_DIR): QFACE_OUTPUT_DIR = $$OUT_PWD @@ -37,11 +38,11 @@ QTEST_ENVIRONMENT = $$upper($$(QTEST_ENVIRONMENT)) # Try to use the internal virtualenv when building qtivi # Because of the two stage build of COIN, it might not exist, but the installed version should still be there -!isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI) { +!isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI):!qtConfig(system-ivigenerator) { VIRTUALENV_PATH = $$INTERNAL_VIRTUALENV_PATH } -!isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI) { +!isEmpty(QTIVI_BUILD_ROOT):!equals(QTEST_ENVIRONMENT, CI):!qtConfig(system-ivigenerator) { IVI_GENERATOR_PATH = $$QTIVI_ROOT/src/tools/ivigenerator } |