diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-05-12 11:55:08 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-05-29 07:58:46 +0000 |
| commit | 5ff59cd054ca0ee280b95dbe6202342e457d83ff (patch) | |
| tree | 6b08ca3913055d3e7bbc52b221af9c64f3c23c5a /mkspecs | |
| parent | 53553219ddc585b08e7f9e197357f6ad36a27a04 (diff) | |
If QFACE_MODULE_NAME is not provided use the name of the qface file
Also if a yaml file exists, add this to the OTHER_FILES section
Change-Id: I030cdab8b565536b2f0750bba2fd650d00af592a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index b6105ac..76cfbac 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -10,8 +10,17 @@ isEmpty(QFACE_FORMAT): QFACE_FORMAT = frontend isEmpty(QFACE_OUTPUT_DIR): QFACE_OUTPUT_DIR = $$OUT_PWD isEmpty(QFACE_SOURCES): error("QFACE_SOURCES must be set!") -# TODO get rid of this, and use the qface file name without extension by default -isEmpty(QFACE_MODULE_NAME): error("QFACE_MODULE_NAME must be set!") + +!contains(QFACE_SOURCES, .+\\.qface$) { + error("Invalid qface file provided: The file needs to end with .qface") +} + +QFACE_BASE_NAME = $$replace(QFACE_SOURCES, .qface, ) +isEmpty(QFACE_MODULE_NAME): QFACE_MODULE_NAME = $$QFACE_BASE_NAME + +exists($$_PRO_FILE_PWD_/$${QFACE_BASE_NAME}.yaml) { + OTHER_FILES += $$_PRO_FILE_PWD_/$${QFACE_BASE_NAME}.yaml +} # Detect whether we are using the feature inside the qtivi repository isEmpty(QTIVI_BUILD_ROOT): VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv |