diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-01-09 16:10:58 +0100 |
|---|---|---|
| committer | Antti Hölttä <ahoelttae@luxoft.com> | 2018-01-10 10:48:43 +0000 |
| commit | 19c7580643cd26903cd5a9fdc867b4b689429bc4 (patch) | |
| tree | 7a37c88a26c45077ccb27821e3ff2f1eaeb380b0 /mkspecs | |
| parent | 16aebfe92b6437768491e4f632c608785ba0c12b (diff) | |
| download | qtivi-19c7580643cd26903cd5a9fdc867b4b689429bc4.tar.gz | |
Improve the qmake ivigenerator integration
Add a Makefile dependency towards the qface file to call the ivigenerator
again once that has changed.
Also introduce a '--force' flag to the ivigenerator which is used by
qmake/make to ensure the output is always written when the ivigenerator is
called. Otherwise the qface library is smart and will only change the
files which actually needs to be changed.
This is needed as 'make' is using timestamps to detect what needs to be
recompiled and calls ivigenerator until the generated pri file is newer
as its dependencies.
Change-Id: I873d0e7e91febed4484468554bc320bb8cc66809
Reviewed-by: Antti Hölttä <ahoelttae@luxoft.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index e94d981..ff8ed2e 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -63,7 +63,7 @@ IVI_GENERATOR = $$VIRTUALENV_PYTHON $$IVI_GENERATOR_PATH/generate.py # In the debug_and_release configuration, we want to have the generator executed # during the run of the meta Makefile to only generate the code once. PRI = $$QFACE_OUTPUT_DIR/$$lower($${QFACE_BASE_NAME}).pri -IVI_GENERATOR_OPTIONS = --format=$$QFACE_FORMAT +IVI_GENERATOR_OPTIONS = --format=$$QFACE_FORMAT --force !isEmpty(QFACE_MODULE_NAME): IVI_GENERATOR_OPTIONS += --module=$$QFACE_MODULE # Windows doesn't offer any other way to sleep for a time inside non-interactive scripts @@ -73,6 +73,7 @@ else: SLEEP = sleep 1 qface_sources.target = $$relative_path($$PRI, $$OUT_PWD) qface_sources.commands = $$SLEEP && $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR) qface_sources.depends = $$IVI_GENERATOR_PATH/generate.py +qface_sources.depends = $$QFACE_ABS_PWD/$${QFACE_FILE} # Add all templates of the generator format as dependency QFACE_TEMPLATE_PWD = $$IVI_GENERATOR_PATH/templates_$${QFACE_FORMAT} |