Commit 0c2b1287 authored by Tobias Hunger's avatar Tobias Hunger

JsonWizard: Make minimum Qt version work

Task-number: QTCREATORBUG-14487
Change-Id: Ic858b131abb2802cb7bfedf58f64c644ea2085e5
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 695b752b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"trDisplayName": "Qt Quick Application", "trDisplayName": "Qt Quick Application",
"trDisplayCategory": "Application", "trDisplayCategory": "Application",
"icon": "qml_wizard.png", "icon": "qml_wizard.png",
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.2.4", "QtSupport.Wizards.FeatureQt" ], "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQtQuick.2" ],
"enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}", "enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
"options": "options":
...@@ -81,7 +81,16 @@ ...@@ -81,7 +81,16 @@
"trDisplayName": "Kit Selection", "trDisplayName": "Kit Selection",
"trShortTitle": "Kits", "trShortTitle": "Kits",
"typeId": "Kits", "typeId": "Kits",
"data": { "projectFilePath": "%{ProFileName}" } "data": {
"projectFilePath": "%{ProFileName}",
"requiredFeatures":
[
"QtSupport.Wizards.FeatureQt",
{ "feature": "QtSupport.Wizards.FeatureQtQuick.2.3", "condition": "%{JS: '%{QtQuickVersion}' === '2.3'}" },
{ "feature": "QtSupport.Wizards.FeatureQtQuick.2.4", "condition": "%{JS: '%{QtQuickVersion}' === '2.4'}" },
{ "feature": "QtSupport.Wizards.FeatureQtQuick.2.5", "condition": "%{JS: '%{QtQuickVersion}' === '2.5'}" }
]
}
}, },
{ {
"trDisplayName": "Project Management", "trDisplayName": "Project Management",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"trDisplayName": "Qt Quick Controls Application", "trDisplayName": "Qt Quick Controls Application",
"trDisplayCategory": "Application", "trDisplayCategory": "Application",
"icon": "../qtquickapplication/qml_wizard.png", "icon": "../qtquickapplication/qml_wizard.png",
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQt" ], "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
"enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}", "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
"options": "options":
...@@ -98,7 +98,15 @@ ...@@ -98,7 +98,15 @@
"trDisplayName": "Kit Selection", "trDisplayName": "Kit Selection",
"trShortTitle": "Kits", "trShortTitle": "Kits",
"typeId": "Kits", "typeId": "Kits",
"data": { "projectFilePath": "%{ProFileName}" } "data": {
"projectFilePath": "%{ProFileName}",
"requiredFeatures":
[
"QtSupport.Wizards.FeatureQt",
{ "feature": "QtSupport.Wizards.FeatureQtQuick.Controls.1.2", "condition": "%{JS: '%{QtQuickControlsVersion' === '1.2' }" },
{ "feature": "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "condition": "%{JS: '%{QtQuickControlsVersion' === '1.3' }" }
]
}
}, },
{ {
"trDisplayName": "Project Management", "trDisplayName": "Project Management",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment