diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
index d633eddf6bf64ea465af6071c1c32fb33d52086d..ff84948f89056b340efc8f86dcd25d7e7ea693e1 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
@@ -7,8 +7,8 @@
     "trDisplayName": "Qt Quick Application",
     "trDisplayCategory": "Application",
     "icon": "qml_wizard.png",
-    "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQtQuick.2" ],
-    "enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}",
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.3" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 }",
 
     "options":
     [
@@ -38,6 +38,7 @@
                     "type": "ComboBox",
                     "data":
                     {
+                        "index": 2,
                         "items":
                         [
                             {
@@ -46,8 +47,7 @@
                                 "{
                                     'qtQuickVersion': '2.5',
                                     'qtQuickWindowVersion': '2.2'
-                                }",
-                                "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.5') >= 0}"
+                                }"
                             },
                             {
                                 "trKey": "Qt 5.4",
@@ -55,8 +55,7 @@
                                 "{
                                     'qtQuickVersion': '2.4',
                                     'qtQuickWindowVersion': '2.2'
-                                }",
-                                "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.4') >= 0}"
+                                }"
                             },
                             {
                                 "trKey": "Qt 5.3",
@@ -64,8 +63,7 @@
                                 "{
                                     'qtQuickVersion': '2.3',
                                     'qtQuickWindowVersion': '2.2'
-                                }",
-                                "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}"
+                                }"
                             }
                         ]
                     }
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
index 7738f28e5acc2acbfdcd7206aa7fa84ee71a0d12..0a57e21bf3b7325da64cc0f5a1bad378497c23df 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
@@ -7,8 +7,8 @@
     "trDisplayName": "Qt Quick Controls Application",
     "trDisplayCategory": "Application",
     "icon": "../qtquickapplication/qml_wizard.png",
-    "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0 }",
+    "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.3" ],
+    "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}",
 
     "options":
     [
@@ -40,6 +40,7 @@
                     "type": "ComboBox",
                     "data":
                     {
+                        "index": 2,
                         "items":
                         [
                             {
@@ -50,8 +51,7 @@
                                     'qtQuickControlsVersion': '1.4',
                                     'qtQuickDialogsVersion': '1.2',
                                     'qtQuickLayoutsVersion': '1.2'
-                                }",
-                                "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.5') >= 0}"
+                                }"
                             },
                             {
                                 "trKey": "Qt 5.4",
@@ -61,8 +61,7 @@
                                     'qtQuickControlsVersion': '1.3',
                                     'qtQuickDialogsVersion': '1.2',
                                     'qtQuickLayoutsVersion': '1.1'
-                                }",
-                                "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.4') >= 0}"
+                                }"
                             },
                             {
                                 "trKey": "Qt 5.3",
@@ -72,8 +71,7 @@
                                     'qtQuickControlsVersion': '1.2',
                                     'qtQuickDialogsVersion': '1.2',
                                     'qtQuickLayoutsVersion': '1.1'
-                                }",
-                                "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}"
+                                }"
                             }
                         ]
                     }