diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-05-28 18:02:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-02 14:15:23 +0000 |
| commit | c5130bb7817358b85e48ebd9fddeb57f770a33ac (patch) | |
| tree | d7c8127a7864ae3eea2464f0e8f6e21432f73e8a | |
| parent | d181ec0c4554b9c4c6c16854e87ea279e1e42552 (diff) | |
Remove whitespace for file names generated from TARGET
Task-number: QTBUG-84492
Change-Id: Ieeec677634fb6d2f43ba1aeb3432a60cd5502894
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit baff6585c0a3f3aeec4f076d04d5b300a08ca5f1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index 4b112351ec..354fa1736f 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$, '') @@ -65,9 +68,9 @@ exists($$DEPENDENCIESFILE): QML_TYPEREGISTRAR_FLAGS += --dependencies=$$DEPENDEN !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 = \ |