QtQuickWizards: Fix versions and make minimum Qt version work

Task-number: QTCREATORBUG-14575
Change-Id: I9ace40e71b8b1d1f753966bb73f0269c4f918afa
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json

@@ -15,7 +15,8 @@
         { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" },
         { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
         { "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":
@@ -86,13 +87,7 @@
             "typeId": "Kits",
             "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'}" }
-                ]
+                "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "%{QtQuickFeature}" ]
             }
         },
         {

share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json

@@ -17,7 +17,8 @@
         { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
         { "key": "QtQuickControlsVersion", "value": "%{JS: %{QtVersion}.qtQuickControlsVersion}" },
         { "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":
@@ -46,7 +47,7 @@
                                 "value":
                                 "{
                                     'qtQuickVersion': '2.5',
-                                    'qtQuickControlsVersion': '1.3',
+                                    'qtQuickControlsVersion': '1.4',
                                     'qtQuickDialogsVersion': '1.2',
                                     'qtQuickLayoutsVersion': '1.2'
                                 }",
@@ -57,7 +58,7 @@
                                 "value":
                                 "{
                                     'qtQuickVersion': '2.4',
-                                    'qtQuickControlsVersion': '1.2',
+                                    'qtQuickControlsVersion': '1.3',
                                     'qtQuickDialogsVersion': '1.2',
                                     'qtQuickLayoutsVersion': '1.1'
                                 }",
@@ -103,12 +104,7 @@
             "typeId": "Kits",
             "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' }" }
-                ]
+                "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "%{QtQuickFeature}" ]
             }
         },
         {