From feb7b011df3d04661fe460ad7a3f532e5e50823d Mon Sep 17 00:00:00 2001 From: Artem Sokolovskii Date: Mon, 20 Sep 2021 09:42:13 +0200 Subject: [PATCH] Wizard: remove .ui files Task-number: QTCREATORBUG-26277 Change-Id: I2ec4dd241f4c3f6c2b4ecae832ca7b608b86fc35 Reviewed-by: Kai Koehne --- .../{HomeForm.ui.qml.tpl => HomeForm.qml.tpl} | 0 .../{Page1Form.ui.qml.tpl => Page1Form.qml.tpl} | 0 .../{Page2Form.ui.qml.tpl => Page2Form.qml.tpl} | 0 .../qtquickapplication/stack/main.qml.tpl | 6 +++--- .../qtquickapplication/stack/wizard.json | 16 ++++++++-------- .../{Page1Form.ui.qml.tpl => Page1Form.qml.tpl} | 0 .../{Page2Form.ui.qml.tpl => Page2Form.qml.tpl} | 0 .../qtquickapplication/swipe/wizard.json | 12 ++++++------ 8 files changed, 17 insertions(+), 17 deletions(-) rename share/qtcreator/templates/wizards/projects/qtquickapplication/stack/{HomeForm.ui.qml.tpl => HomeForm.qml.tpl} (100%) rename share/qtcreator/templates/wizards/projects/qtquickapplication/stack/{Page1Form.ui.qml.tpl => Page1Form.qml.tpl} (100%) rename share/qtcreator/templates/wizards/projects/qtquickapplication/stack/{Page2Form.ui.qml.tpl => Page2Form.qml.tpl} (100%) rename share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/{Page1Form.ui.qml.tpl => Page1Form.qml.tpl} (100%) rename share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/{Page2Form.ui.qml.tpl => Page2Form.qml.tpl} (100%) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.ui.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.qml.tpl similarity index 100% rename from share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.ui.qml.tpl rename to share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.qml.tpl diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.ui.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl similarity index 100% rename from share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.ui.qml.tpl rename to share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.ui.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl similarity index 100% rename from share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.ui.qml.tpl rename to share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl index f2285c512d2..bced4fd0a5f 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl @@ -45,7 +45,7 @@ ApplicationWindow { text: qsTr("Page 1") width: parent.width onClicked: { - stackView.push("Page1Form.ui.qml") + stackView.push("Page1Form.qml") drawer.close() } } @@ -53,7 +53,7 @@ ApplicationWindow { text: qsTr("Page 2") width: parent.width onClicked: { - stackView.push("Page2Form.ui.qml") + stackView.push("Page2Form.qml") drawer.close() } } @@ -62,7 +62,7 @@ ApplicationWindow { StackView { id: stackView - initialItem: "HomeForm.ui.qml" + initialItem: "HomeForm.qml" anchors.fill: parent } @if %{UseVirtualKeyboard} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index b656fef2a0b..8e8d34147bb 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -27,8 +27,8 @@ { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" }, - { "key": "AdditionalQmlFiles", "value": "HomeForm.ui.qml Page1Form.ui.qml Page2Form.ui.qml" }, - { "key": "AdditionalQmlFilesQbs", "value": ", \"HomeForm.ui.qml\", \"Page1Form.ui.qml\", \"Page2Form.ui.qml\"" } + { "key": "AdditionalQmlFiles", "value": "HomeForm.qml Page1Form.qml Page2Form.qml" }, + { "key": "AdditionalQmlFilesQbs", "value": ", \"HomeForm.qml\", \"Page1Form.qml\", \"Page2Form.qml\"" } ], @@ -280,16 +280,16 @@ "openInEditor": true }, { - "source": "HomeForm.ui.qml.tpl", - "target": "HomeForm.ui.qml" + "source": "HomeForm.qml.tpl", + "target": "HomeForm.qml" }, { - "source": "Page1Form.ui.qml.tpl", - "target": "Page1Form.ui.qml" + "source": "Page1Form.qml.tpl", + "target": "Page1Form.qml" }, { - "source": "Page2Form.ui.qml.tpl", - "target": "Page2Form.ui.qml" + "source": "Page2Form.qml.tpl", + "target": "Page2Form.qml" }, { "source": "../qtquickcontrols2.conf", diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.ui.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.qml.tpl similarity index 100% rename from share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.ui.qml.tpl rename to share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.qml.tpl diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.ui.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl similarity index 100% rename from share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.ui.qml.tpl rename to share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index ad3a567230b..739c7a6fcc8 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -27,8 +27,8 @@ { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" }, - { "key": "AdditionalQmlFiles", "value": "Page1Form.ui.qml Page2Form.ui.qml" }, - { "key": "AdditionalQmlFilesQbs", "value": ", \"Page1Form.ui.qml\", \"Page2Form.ui.qml\"" } + { "key": "AdditionalQmlFiles", "value": "Page1Form.qml Page2Form.qml" }, + { "key": "AdditionalQmlFilesQbs", "value": ", \"Page1Form.qml\", \"Page2Form.qml\"" } ], "pages": @@ -279,12 +279,12 @@ "openInEditor": true }, { - "source": "Page1Form.ui.qml.tpl", - "target": "Page1Form.ui.qml" + "source": "Page1Form.qml.tpl", + "target": "Page1Form.qml" }, { - "source": "Page2Form.ui.qml.tpl", - "target": "Page2Form.ui.qml" + "source": "Page2Form.qml.tpl", + "target": "Page2Form.qml" }, { "source": "../qtquickcontrols2.conf",