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

Wizards: Fix Kit selection for Qt 6.5 cmake projects

Browse Source 
Fixes: QTCREATORBUG-31852
Change-Id: I60076435ced9febb92b29ccbb57c65602f9284e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-10-17 16:10:58 +02:00
parent 3f7e8f43b7
commit 4fd0f1cf23
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/templates/wizards/projects/consoleapp/wizard.json
View File

@@ -19,7 +19,8 @@
{ "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" }, { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" },
{ "key": "MesonFile", "value": "%{ProjectDirectory}/meson.build" }, { "key": "MesonFile", "value": "%{ProjectDirectory}/meson.build" },
{ "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" },
{ "key": "CppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" } { "key": "CppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
{ "key": "FeatureQt", "value": "QtSupport.Wizards.FeatureQt%{JS: value('BuildSystem') === 'cmake-qt6' ? '.6.5' : ''}" }
], ],
"pages": "pages":
@@ -86,7 +87,10 @@
"trDisplayName": "Kit Selection", "trDisplayName": "Kit Selection",
"trShortTitle": "Kits", "trShortTitle": "Kits",
"typeId": "Kits", "typeId": "Kits",
"data": { "projectFilePath": "%{ProjectFile}" } "data": {
"projectFilePath": "%{ProjectFile}",
"requiredFeatures": [ "%{FeatureQt}"]
}
}, },
{ {
"trDisplayName": "Project Management", "trDisplayName": "Project Management",

9
share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
View File

@@ -25,9 +25,9 @@
{ "key": "UiHdrFileName", "value": "%{JS: (value('BuildSystem') === 'cmake' ? (Util.path(value('FormFileName')) + '/') : '') + 'ui_' + Util.completeBaseName(value('FormFileName')) + '.h'}" }, { "key": "UiHdrFileName", "value": "%{JS: (value('BuildSystem') === 'cmake' ? (Util.path(value('FormFileName')) + '/') : '') + 'ui_' + Util.completeBaseName(value('FormFileName')) + '.h'}" },
{ "key": "CN", "value": "%{JS: Cpp.className(value('Class'))}" }, { "key": "CN", "value": "%{JS: Cpp.className(value('Class'))}" },
{ "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" },
{ "key": "GUARD", "value": "%{JS: Cpp.headerGuard(value('HdrFileName'))}" } { "key": "GUARD", "value": "%{JS: Cpp.headerGuard(value('HdrFileName'))}" },
{ "key": "FeatureQt", "value": "QtSupport.Wizards.FeatureQt%{JS: value('BuildSystem') === 'cmake-qt6' ? '.6.5' : ''}" }
], ],
"pages": "pages":
[ [
{ {
@@ -165,7 +165,10 @@
"trDisplayName": "Kit Selection", "trDisplayName": "Kit Selection",
"trShortTitle": "Kits", "trShortTitle": "Kits",
"typeId": "Kits", "typeId": "Kits",
"data": { "projectFilePath": "%{ProjectFile}" } "data": {
"projectFilePath": "%{ProjectFile}",
"requiredFeatures": [ "%{FeatureQt}"]
}
}, },
{ {
"trDisplayName": "Project Management", "trDisplayName": "Project Management",