Commit e509441e authored by Tobias Hunger's avatar Tobias Hunger

JsonWizards: Only show wizards with Qt versions that support them

Task-number: QTCREATORBUG-14216
Change-Id: I7e9e760f7ba9ef6022e76f1600e473a5f54c9893
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 0c2b1287
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"trDisplayCategory": "Application", "trDisplayCategory": "Application",
"icon": "qml_wizard.png", "icon": "qml_wizard.png",
"featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQtQuick.2" ], "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQtQuick.2" ],
"enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}", "enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}",
"options": "options":
[ [
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
"{ "{
'qtQuickVersion': '2.5', 'qtQuickVersion': '2.5',
'qtQuickWindowVersion': '2.2' 'qtQuickWindowVersion': '2.2'
}" }",
"condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.5') >= 0}"
}, },
{ {
"trKey": "Qt 5.4", "trKey": "Qt 5.4",
...@@ -53,7 +54,8 @@ ...@@ -53,7 +54,8 @@
"{ "{
'qtQuickVersion': '2.4', 'qtQuickVersion': '2.4',
'qtQuickWindowVersion': '2.2' 'qtQuickWindowVersion': '2.2'
}" }",
"condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.4') >= 0}"
}, },
{ {
"trKey": "Qt 5.3", "trKey": "Qt 5.3",
...@@ -61,7 +63,8 @@ ...@@ -61,7 +63,8 @@
"{ "{
'qtQuickVersion': '2.3', 'qtQuickVersion': '2.3',
'qtQuickWindowVersion': '2.2' 'qtQuickWindowVersion': '2.2'
}" }",
"condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}"
} }
] ]
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"trDisplayCategory": "Application", "trDisplayCategory": "Application",
"icon": "../qtquickapplication/qml_wizard.png", "icon": "../qtquickapplication/qml_wizard.png",
"featuresRequired": [ "QtSupport.Wizards.FeatureQt" ], "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
"enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}", "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0 }",
"options": "options":
[ [
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
'qtQuickControlsVersion': '1.3', 'qtQuickControlsVersion': '1.3',
'qtQuickDialogsVersion': '1.2', 'qtQuickDialogsVersion': '1.2',
'qtQuickLayoutsVersion': '1.2' 'qtQuickLayoutsVersion': '1.2'
}" }",
"condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.5') >= 0}"
}, },
{ {
"trKey": "Qt 5.4", "trKey": "Qt 5.4",
...@@ -59,7 +60,8 @@ ...@@ -59,7 +60,8 @@
'qtQuickControlsVersion': '1.2', 'qtQuickControlsVersion': '1.2',
'qtQuickDialogsVersion': '1.2', 'qtQuickDialogsVersion': '1.2',
'qtQuickLayoutsVersion': '1.1' 'qtQuickLayoutsVersion': '1.1'
}" }",
"condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.4') >= 0}"
}, },
{ {
"trKey": "Qt 5.3", "trKey": "Qt 5.3",
...@@ -69,7 +71,8 @@ ...@@ -69,7 +71,8 @@
'qtQuickControlsVersion': '1.2', 'qtQuickControlsVersion': '1.2',
'qtQuickDialogsVersion': '1.2', 'qtQuickDialogsVersion': '1.2',
'qtQuickLayoutsVersion': '1.1' 'qtQuickLayoutsVersion': '1.1'
}" }",
"condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}"
} }
] ]
} }
......
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