From 2119ef72b0401d4e7e97107793b638e55b3b9204 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 16 Oct 2023 14:12:55 +0200 Subject: [PATCH] AutoTest: Fix creating test projects for cmake and qbs ...if the respective kits have no Qt configured. GTest and Catch2 get fixed with separate patches. Change-Id: Ib3eb92e97fd683f42e3666bd41728a3824e230ec Reviewed-by: Marcus Tillmanns --- .../qtcreator/templates/wizards/autotest/boosttest/wizard.json | 3 +-- share/qtcreator/templates/wizards/autotest/qttest/wizard.json | 3 +-- .../qtcreator/templates/wizards/autotest/quicktest/wizard.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/templates/wizards/autotest/boosttest/wizard.json b/share/qtcreator/templates/wizards/autotest/boosttest/wizard.json index 4b674389bc4..01b79081268 100644 --- a/share/qtcreator/templates/wizards/autotest/boosttest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/boosttest/wizard.json @@ -8,7 +8,6 @@ "trDisplayCategory": "Test Project", "icon": "../autotest.png", "iconKind": "Themed", - "featuresRequired": [ "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", "options": @@ -151,7 +150,7 @@ "enabled": "%{IsTopLevelProject}", "data": { "projectFilePath": "%{ProjectFilePath}", - "requiredFeatures": [ "%{JS: value('BuildSystem') === 'qmake' ? 'QtSupport.Wizards.FeatureQt' : 'QtSupport.Wizards.FeatureDesktop' }" ] + "requiredFeatures": [ "%{JS: value('BuildSystem') === 'qmake' ? 'QtSupport.Wizards.FeatureQt' : 'DeviceType.Desktop' }" ] } }, { diff --git a/share/qtcreator/templates/wizards/autotest/qttest/wizard.json b/share/qtcreator/templates/wizards/autotest/qttest/wizard.json index 75de005b3ad..0236a24a5ab 100644 --- a/share/qtcreator/templates/wizards/autotest/qttest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/qttest/wizard.json @@ -8,7 +8,6 @@ "trDisplayCategory": "Test Project", "icon": "../autotest.png", "iconKind": "Themed", - "featuresRequired": [ "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", "options": @@ -128,7 +127,7 @@ "enabled": "%{IsTopLevelProject}", "data": { "projectFilePath": "%{ProjectFilePath}", - "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureDesktop" ] + "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "DeviceType.Desktop" ] } }, { diff --git a/share/qtcreator/templates/wizards/autotest/quicktest/wizard.json b/share/qtcreator/templates/wizards/autotest/quicktest/wizard.json index e23fca42d98..bbcf7c41479 100644 --- a/share/qtcreator/templates/wizards/autotest/quicktest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/quicktest/wizard.json @@ -8,7 +8,6 @@ "trDisplayCategory": "Test Project", "icon": "../autotest.png", "iconKind": "Themed", - "featuresRequired": [ "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", "options": @@ -123,7 +122,7 @@ "enabled": "%{IsTopLevelProject}", "data": { "projectFilePath": "%{ProjectFilePath}", - "requiredFeatures": [ "QtSupport.Wizards.FeatureQtQuick.2", "QtSupport.Wizards.FeatureDesktop" ] + "requiredFeatures": [ "QtSupport.Wizards.FeatureQtQuick.2", "DeviceType.Desktop" ] } }, {