From baff6585c0a3f3aeec4f076d04d5b300a08ca5f1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 May 2020 18:02:18 +0200 Subject: Remove whitespace for file names generated from TARGET Task-number: QTBUG-84492 Pick-to: 5.15 Change-Id: Ieeec677634fb6d2f43ba1aeb3432a60cd5502894 Reviewed-by: Joerg Bornemann --- src/qmltyperegistrar/qmltypes.prf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/qmltyperegistrar/qmltypes.prf') diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index 18fd089c0a..e02d425f2a 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -29,9 +29,12 @@ isEmpty(QML_IMPORT_MINOR_VERSION) { QML_IMPORT_MINOR_VERSION = 0 } +TARGET_BASENAME = $$lower($$basename(TARGET)) +TARGET_BASENAME ~= s/\s/_/g + isEmpty(QMLTYPES_FILENAME) { plugin: QMLTYPES_FILENAME = plugins.qmltypes - else: QMLTYPES_FILENAME = $${TARGET}.qmltypes + else: QMLTYPES_FILENAME = $${TARGET_BASENAME}.qmltypes } qt_module_deps = $$replace(QT, -private$, '') @@ -62,9 +65,9 @@ QML_TYPEREGISTRAR_FLAGS = \ !isEmpty(MODULE_PRIVATE_INCLUDES): QML_TYPEREGISTRAR_FLAGS += --private-includes -METATYPES_JSON = $$lower($$basename(TARGET))_metatypes.json +METATYPES_JSON = $${TARGET_BASENAME}_metatypes.json -TYPEREGISTRATIONS = $$lower($$basename(TARGET))_qmltyperegistrations$${first(QMAKE_EXT_CPP)} +TYPEREGISTRATIONS = $${TARGET_BASENAME}_qmltyperegistrations$${first(QMAKE_EXT_CPP)} qmltyperegistrar_compiler.CONFIG += combine qmltyperegistrar_compiler.commands = \ -- cgit v1.2.3