Commit d41c634b authored by Tobias Hunger's avatar Tobias Hunger

QtQuickWizards: Fix versions and make minimum Qt version work

Task-number: QTCREATORBUG-14575
Change-Id: I9ace40e71b8b1d1f753966bb73f0269c4f918afa
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 040a0f2d
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
{ "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" }, { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" },
{ "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" }, { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
{ "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" }, { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
{ "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" } { "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" },
{ "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }
], ],
"pages": "pages":
...@@ -86,13 +87,7 @@ ...@@ -86,13 +87,7 @@
"typeId": "Kits", "typeId": "Kits",
"data": { "data": {
"projectFilePath": "%{ProFileName}", "projectFilePath": "%{ProFileName}",
"requiredFeatures": "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "%{QtQuickFeature}" ]
[
"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'}" }
]
} }
}, },
{ {
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
{ "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" }, { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
{ "key": "QtQuickControlsVersion", "value": "%{JS: %{QtVersion}.qtQuickControlsVersion}" }, { "key": "QtQuickControlsVersion", "value": "%{JS: %{QtVersion}.qtQuickControlsVersion}" },
{ "key": "QtQuickDialogsVersion", "value": "%{JS: %{QtVersion}.qtQuickDialogsVersion}" }, { "key": "QtQuickDialogsVersion", "value": "%{JS: %{QtVersion}.qtQuickDialogsVersion}" },
{ "key": "QtQuickLayoutsVersion", "value": "%{JS: %{QtVersion}.qtQuickLayoutsVersion}" } { "key": "QtQuickLayoutsVersion", "value": "%{JS: %{QtVersion}.qtQuickLayoutsVersion}" },
{ "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }
], ],
"pages": "pages":
...@@ -46,7 +47,7 @@ ...@@ -46,7 +47,7 @@
"value": "value":
"{ "{
'qtQuickVersion': '2.5', 'qtQuickVersion': '2.5',
'qtQuickControlsVersion': '1.3', 'qtQuickControlsVersion': '1.4',
'qtQuickDialogsVersion': '1.2', 'qtQuickDialogsVersion': '1.2',
'qtQuickLayoutsVersion': '1.2' 'qtQuickLayoutsVersion': '1.2'
}", }",
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
"value": "value":
"{ "{
'qtQuickVersion': '2.4', 'qtQuickVersion': '2.4',
'qtQuickControlsVersion': '1.2', 'qtQuickControlsVersion': '1.3',
'qtQuickDialogsVersion': '1.2', 'qtQuickDialogsVersion': '1.2',
'qtQuickLayoutsVersion': '1.1' 'qtQuickLayoutsVersion': '1.1'
}", }",
...@@ -103,12 +104,7 @@ ...@@ -103,12 +104,7 @@
"typeId": "Kits", "typeId": "Kits",
"data": { "data": {
"projectFilePath": "%{ProFileName}", "projectFilePath": "%{ProFileName}",
"requiredFeatures": "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "%{QtQuickFeature}" ]
[
"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' }" }
]
} }
}, },
{ {
......
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