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

QtcWizard: Fix build empty project

Browse Source 
Added TargetName parameter for executable file name
in order to avoid names conflict between qml resource folder and
executable file name.

Fixes: QTCREATORBUG-26375
Change-Id: I7f59b8001246d175a87309a9b31ff7110d76b148
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Artem Sokolovskii
2021-10-27 09:39:50 +02:00
parent 5d190fcfaa
commit 691e340b81
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.6.x.txt
View File

@@ -7,17 +7,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Qt6 6.2 COMPONENTS Quick REQUIRED)
qt_add_executable(%{ProjectName}
qt_add_executable(%{TargetName}
main.cpp
)
qt_add_qml_module(%{ProjectName}
qt_add_qml_module(%{TargetName}
URI %{ProjectName}
VERSION 1.0
QML_FILES main.qml %{AdditionalQmlFiles}
)
target_compile_definitions(%{ProjectName}
target_compile_definitions(%{TargetName}
PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
target_link_libraries(%{ProjectName}
target_link_libraries(%{TargetName}
PRIVATE Qt6::Quick)

3
share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
View File

@@ -27,7 +27,8 @@
{ "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" },
{ "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" },
{ "key": "AdditionalQmlFiles", "value": "" },
{ "key": "AdditionalQmlFilesQbs", "value": "" }
{ "key": "AdditionalQmlFilesQbs", "value": "" },
{ "key": "TargetName", "value": "%{JS: 'app' + value('ProjectName')}" }
],
"pages":