diff options
| -rw-r--r-- | mkspecs/features/metatypes.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mkspecs/features/metatypes.prf b/mkspecs/features/metatypes.prf index 555269fa68..68c6f1790f 100644 --- a/mkspecs/features/metatypes.prf +++ b/mkspecs/features/metatypes.prf @@ -24,7 +24,10 @@ moc_json_source.depends = $${MOC_JSON_CPP_BASE}${QMAKE_FILE_BASE}$${QMAKE_EXT_CP moc_json_source.commands = $$escape_expand(\\n) # force creation of rule moc_json_source.variable_out = MOC_JSON_FILES -MOC_COLLECT_JSON_OUTPUT = $$lower($$basename(TARGET))_metatypes.json +TARGET_BASENAME = $$lower($$basename(TARGET)) +TARGET_BASENAME ~= s/\s/_/g + +MOC_COLLECT_JSON_OUTPUT = $${TARGET_BASENAME}_metatypes.json moc_collect_json.CONFIG += no_link combine target_predeps moc_collect_json.commands = $$MOC_COLLECT_JSON --collect-json -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 99b7fe6562..69d1954306 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -131,7 +131,10 @@ import_plugins:qtConfig(static) { else: \ warning("Plugin class name could not be determined for plugin '$$plug'.") } - IMPORT_CPP = $$OUT_PWD/$$lower($$basename(TARGET))_plugin_import.cpp + TARGET_BASENAME = $$lower($$basename(TARGET)) + TARGET_BASENAME ~= s/\s/_/g + + IMPORT_CPP = $$OUT_PWD/$${TARGET_BASENAME}_plugin_import.cpp write_file($$IMPORT_CPP, IMPORT_FILE_CONT)|error() GENERATED_SOURCES += $$IMPORT_CPP QMAKE_DISTCLEAN += $$IMPORT_CPP @@ -331,7 +334,10 @@ contains(all_qt_module_deps, qml): \ } } } - QML_IMPORT_CPP = $$OUT_PWD/$$lower($$basename(TARGET))_qml_plugin_import.cpp + TARGET_BASENAME = $$lower($$basename(TARGET)) + TARGET_BASENAME ~= s/\s/_/g + + QML_IMPORT_CPP = $$OUT_PWD/$${TARGET_BASENAME}_qml_plugin_import.cpp write_file($$QML_IMPORT_CPP, IMPORT_FILE_CONT)|error() GENERATED_SOURCES += $$QML_IMPORT_CPP QMAKE_DISTCLEAN += $$QML_IMPORT_CPP |