diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.qml b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.qml
index 5ab93ecb205..8e8a45b4eed 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.qml
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.qml
@@ -4,7 +4,7 @@ import QtQuick.Window %{QtQuickWindowVersion}
 Window {
     visible: true
 
-@if %{QmlUISplit}
+@if %{IsUiFileInUse}
     MainForm {
         anchors.fill: parent
         mouseArea.onClicked: {
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/qml.qrc b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/qml.qrc
index 068979cb030..b6165a029b7 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/qml.qrc
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/qml.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-@if %{QmlUISplit}
+@if %{IsUiFileInUse}
         <file>MainForm.ui.qml</file>
 @endif
     </qresource>
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
index ff84948f890..de3d358440a 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
@@ -16,7 +16,9 @@
         { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
         { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
         { "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" },
-        { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }
+        { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" },
+        { "key": "UiSupport", "value": "%{JS: '%{QtQuickVersion}' !== '2.3' }" },
+        { "key": "IsUiFileInUse", "value": "%{JS: %{UiSupport} && %{QmlUiSplit} }" }
     ],
 
     "pages":
@@ -69,12 +71,13 @@
                     }
                 },
                 {
-                    "name": "QmlUISplit",
+                    "name": "QmlUiSplit",
                     "trDisplayName": "With ui.qml file",
                     "type": "CheckBox",
+                    "visible": "%{UiSupport}",
                     "data":
                     {
-                        "checked": false
+                        "checked": true
                     }
                 }
             ]
@@ -115,7 +118,7 @@
                 },
                 {
                     "source": "MainForm.ui.qml",
-                    "condition": "%{QmlUISplit}"
+                    "condition": "%{IsUiFileInUse}"
                 },
                 {
                     "source": "qml.qrc"
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.qml b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.qml
index f581c7c226c..3378f4f131b 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.qml
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.qml
@@ -1,6 +1,6 @@
 import QtQuick %{QtQuickVersion}
 import QtQuick.Controls %{QtQuickControlsVersion}
-@if %{QmlUISplit}
+@if %{IsUiFileInUse}
 import QtQuick.Dialogs %{QtQuickDialogsVersion}
 @endif
 
@@ -24,7 +24,7 @@ ApplicationWindow {
         }
     }
 
-@if %{QmlUISplit}
+@if %{IsUiFileInUse}
     MainForm {
         anchors.fill: parent
         button1.onClicked: messageDialog.show(qsTr("Button 1 pressed"))
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/qml.qrc b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/qml.qrc
index 068979cb030..b6165a029b7 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/qml.qrc
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/qml.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-@if %{QmlUISplit}
+@if %{IsUiFileInUse}
         <file>MainForm.ui.qml</file>
 @endif
     </qresource>
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
index 0a57e21bf3b..fffd8650563 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
@@ -18,7 +18,9 @@
         { "key": "QtQuickControlsVersion", "value": "%{JS: %{QtVersion}.qtQuickControlsVersion}" },
         { "key": "QtQuickDialogsVersion", "value": "%{JS: %{QtVersion}.qtQuickDialogsVersion}" },
         { "key": "QtQuickLayoutsVersion", "value": "%{JS: %{QtVersion}.qtQuickLayoutsVersion}" },
-        { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }
+        { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" },
+        { "key": "UiSupport", "value": "%{JS: '%{QtQuickVersion}' !== '2.3' }" },
+        { "key": "IsUiFileInUse", "value": "%{JS: %{UiSupport} && %{QmlUiSplit} }" }
     ],
 
     "pages":
@@ -77,9 +79,10 @@
                     }
                 },
                 {
-                    "name": "QmlUISplit",
+                    "name": "QmlUiSplit",
                     "trDisplayName": "With ui.qml file",
                     "type": "CheckBox",
+                    "visible": "%{UiSupport}",
                     "data":
                     {
                         "checked": true
@@ -132,7 +135,7 @@
                 },
                 {
                     "source": "MainForm.ui.qml",
-                    "condition": "%{QmlUISplit}"
+                    "condition": "%{IsUiFileInUse}"
                 },
                 {
                     "source": "qml.qrc"
diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp
index 0dc797406b2..159974d0d23 100644
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -274,7 +274,7 @@ QString MacroExpander::expand(const QString &stringWithVariables) const
     if (d->m_lockDepth == 0)
         d->m_aborted = false;
 
-    if (d->m_lockDepth > 3) { // Limit recursion.
+    if (d->m_lockDepth > 10) { // Limit recursion.
         d->m_aborted = true;
         return QString();
     }