feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Handle projects with "-" in their name

Browse Source 
Using "-" in a McuSupport project's name will result in errors. This
commit fixes that by changing the occurrences of "-" with "_" in the
templates used for generating the project.

Task-number: QTCREATORBUG-26512
Change-Id: I7e65e3992bf1fa139d008ff5c2221a1098c12b92
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
This commit is contained in:
Yasser Grimes
2022-08-01 16:46:23 +03:00
committed by Piotr Mućko
parent 2d375eb776
commit cd36947561
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/mcusupport/wizards/application/CMakeLists.txt
View File

@@ -1,10 +1,10 @@
cmake_minimum_required (VERSION 3.15) cmake_minimum_required (VERSION 3.15)
project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM)
find_package(Qul) find_package(Qul)
qul_add_target(%{ProjectName}) qul_add_target(%{CorrectedProjectName})
qul_target_qml_sources(%{ProjectName} %{MainQmlFile}) qul_target_qml_sources(%{CorrectedProjectName} %{MainQmlFile})
app_target_setup_os(%{ProjectName}) app_target_setup_os(%{CorrectedProjectName})
app_target_default_entrypoint(%{ProjectName} %{RootItemName}) app_target_default_entrypoint(%{CorrectedProjectName} %{RootItemName})

5
src/plugins/mcusupport/wizards/application/wizard.json
View File

@@ -12,8 +12,9 @@
"options": "options":
[ [
{ "key": "MainQmlFile", "value": "%{ProjectName}.qml" }, { "key": "CorrectedProjectName", "value": "%{JS: '%{ProjectName}'.replace(/-/g, '_')}"},
{ "key": "RootItemName", "value": "%{ProjectName}" }, { "key": "MainQmlFile", "value": "%{JS: '%{CorrectedProjectName}.qml'}" },
{ "key": "RootItemName", "value": "%{JS: '%{CorrectedProjectName}'}" },
{ "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" } { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" }
], ],

8
src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt
View File

@@ -1,9 +1,9 @@
cmake_minimum_required (VERSION 3.15) cmake_minimum_required (VERSION 3.15)
project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM)
find_package(Qul) find_package(Qul)
qul_add_target(%{ProjectName} QML_PROJECT %{QmlProjectFile}) qul_add_target(%{CorrectedProjectName} QML_PROJECT %{QmlProjectFile})
app_target_setup_os(%{ProjectName}) app_target_setup_os(%{CorrectedProjectName})
app_target_default_entrypoint(%{ProjectName} %{RootItemName}) app_target_default_entrypoint(%{CorrectedProjectName} %{RootItemName})

7
src/plugins/mcusupport/wizards/qmlproject/wizard.json
View File

@@ -12,9 +12,10 @@
"options": "options":
[ [
{ "key": "MainQmlFile", "value": "%{ProjectName}.qml" }, { "key": "CorrectedProjectName", "value": "%{JS: '%{ProjectName}'.replace(/-/g, '_')}"},
{ "key": "QmlProjectFile", "value": "%{ProjectName}.qmlproject" }, { "key": "MainQmlFile", "value": "%{CorrectedProjectName}.qml" },
{ "key": "RootItemName", "value": "%{ProjectName}" }, { "key": "QmlProjectFile", "value": "%{CorrectedProjectName}.qmlproject" },
{ "key": "RootItemName", "value": "%{CorrectedProjectName}" },
{ "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" }, { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" },
{ "key": "ModuleFile", "value": "CustomModule.qmlproject"}, { "key": "ModuleFile", "value": "CustomModule.qmlproject"},
{ "key": "QmlComponent", "value": "CustomComponent.qml"} { "key": "QmlComponent", "value": "CustomComponent.qml"}