diff options
author | Mike Krus <mike.krus@kdab.com> | 2017-09-30 22:04:41 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-10-03 15:09:21 +0000 |
commit | 69a939e5a1b99f5eef5a1dbdc270808ab234d4a7 (patch) | |
tree | 76a3dd295d0b2612733d28fc3050e532afd6981b | |
parent | 3a452261352d7071f14db320b570b59bdc530e04 (diff) |
Restore macOS support
Adding a delay before generating the code appears to introduce
enough difference to avoid race conditions between makefile and
generate code timestamps
Change-Id: I7ba3361492053b65ddd89b41ee46c32cec96f8ab
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r-- | mkspecs/features/ivigenerator.prf | 3 | ||||
-rw-r--r-- | qtivi.pro | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index 74cac03..b7a3991 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -62,7 +62,8 @@ IVI_GENERATOR_OPTIONS = --format=$$QFACE_FORMAT !isEmpty(QFACE_MODULE_NAME): IVI_GENERATOR_OPTIONS += --module=$$QFACE_MODULE qface_sources.target = $$relative_path($$PRI, $$OUT_PWD) -qface_sources.commands = $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR) +macos: qface_sources.commands = sleep 1 && $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR) +else: qface_sources.commands = $$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 # Add all templates of the generator format as dependency @@ -1,5 +1,3 @@ -requires(!macos) - enable-examples { QTIVI_BUILD_PARTS = $$QT_BUILD_PARTS QTIVI_BUILD_PARTS *= examples |