Commit 4dbc0bdb authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Wizards: Do not offer UI files in Qt Quick projects based on qmlproject



Task-number: QTCREATORBUG-14712
Change-Id: Ic171cbeb4b5e4c52f872c7c4ccedcbfa61be4ab8
Reviewed-by: default avatarRobert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent c1e418c2
......@@ -15,7 +15,9 @@
{ "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'qmlproject')}" },
{ "key": "MainQmlFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qml')}" },
{ "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" },
{ "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" }
{ "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" },
{ "key": "UiSupport", "value": "%{JS: '%{QtQuickVersion}' !== '2.3' }" },
{ "key": "IsUiFileInUse", "value": "%{JS: %{UiSupport} && %{QmlUiSplit} }" }
],
"pages":
......@@ -67,9 +69,10 @@
}
},
{
"name": "QmlUISplit",
"name": "QmlUiSplit",
"trDisplayName": "With ui.qml file",
"type": "CheckBox",
"visible": "%{UiSupport}",
"data":
{
"checked": false
......@@ -102,7 +105,7 @@
{
"source": "../../qmake/qtquickapplication/MainForm.ui.qml",
"target": "%{ProjectDirectory}/MainForm.ui.qml",
"condition": "%{QmlUISplit}"
"condition": "%{IsUiFileInUse}"
},
{
"source": "../../git.ignore",
......
......@@ -17,7 +17,9 @@
{ "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": "UiSupport", "value": "%{JS: '%{QtQuickVersion}' !== '2.3' }" },
{ "key": "IsUiFileInUse", "value": "%{JS: %{UiSupport} && %{QmlUiSplit} }" }
],
"pages":
......@@ -75,9 +77,10 @@
}
},
{
"name": "QmlUISplit",
"name": "QmlUiSplit",
"trDisplayName": "With ui.qml file",
"type": "CheckBox",
"visible": "%{UiSupport}",
"data":
{
"checked": true
......@@ -110,7 +113,7 @@
{
"source": "../../qmake/qtquickcontrolsapplication/MainForm.ui.qml",
"target": "%{ProjectDirectory}/MainForm.ui.qml",
"condition": "%{QmlUISplit}"
"condition": "%{IsUiFileInUse}"
},
{
"source": "../../git.ignore",
......
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