From 8658258f2f8d8dac3327a870573dc046029b74bc Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 4 Apr 2018 12:08:00 +0200 Subject: ivigenerator: Generate correct public headers when building a qt module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building a qt module all public headers need to use the module name in their include statements. This is done by using the QFACE_MODULE_NAME qmake variable, which is now mandatory when generating a qt module from a qface file Change-Id: I31232a48a3c978552a27f1d82f3eacba480427b2 Reviewed-by: Antti Hölttä --- mkspecs/features/ivigenerator.prf | 2 +- mkspecs/features/ivigenerator_qt_module.prf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index ff8ed2e..8f98234 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -64,7 +64,7 @@ IVI_GENERATOR = $$VIRTUALENV_PYTHON $$IVI_GENERATOR_PATH/generate.py # 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 --force -!isEmpty(QFACE_MODULE_NAME): IVI_GENERATOR_OPTIONS += --module=$$QFACE_MODULE +!isEmpty(QFACE_MODULE_NAME): IVI_GENERATOR_OPTIONS += --module=$${QFACE_MODULE_NAME} # Windows doesn't offer any other way to sleep for a time inside non-interactive scripts equals(QMAKE_HOST.os, Windows): SLEEP = ping -n 2 127.0.0.1 >nul diff --git a/mkspecs/features/ivigenerator_qt_module.prf b/mkspecs/features/ivigenerator_qt_module.prf index bceff89..7533c1e 100644 --- a/mkspecs/features/ivigenerator_qt_module.prf +++ b/mkspecs/features/ivigenerator_qt_module.prf @@ -13,6 +13,10 @@ error("Invalid qface file provided: The file needs to end with .qface") } +isEmpty(QFACE_MODULE_NAME) { + error("QFACE_MODULE_NAME needs to be set when a qt module should be generated") +} + QFACE_PWD = $$dirname(QFACE_SOURCES) QFACE_ABS_PWD = $$absolute_path($$QFACE_PWD, $$_PRO_FILE_PWD_) -- cgit v1.2.1