feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Wizard: remove .ui files

Browse Source 
Task-number: QTCREATORBUG-26277
Change-Id: I2ec4dd241f4c3f6c2b4ecae832ca7b608b86fc35
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Artem Sokolovskii
2021-09-20 09:42:13 +02:00
parent 002d0a97aa
commit feb7b011df
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.ui.qml.tpl → share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.qml.tpl
View File

0
share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.ui.qml.tpl → share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl
View File

0
share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.ui.qml.tpl → share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl
View File

6
share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl
View File

@@ -45,7 +45,7 @@ ApplicationWindow {
text: qsTr("Page 1") text: qsTr("Page 1")
width: parent.width width: parent.width
onClicked: { onClicked: {
stackView.push("Page1Form.ui.qml") stackView.push("Page1Form.qml")
drawer.close() drawer.close()
} }
} }
@@ -53,7 +53,7 @@ ApplicationWindow {
text: qsTr("Page 2") text: qsTr("Page 2")
width: parent.width width: parent.width
onClicked: { onClicked: {
stackView.push("Page2Form.ui.qml") stackView.push("Page2Form.qml")
drawer.close() drawer.close()
} }
} }
@@ -62,7 +62,7 @@ ApplicationWindow {
StackView { StackView {
id: stackView id: stackView
initialItem: "HomeForm.ui.qml" initialItem: "HomeForm.qml"
anchors.fill: parent anchors.fill: parent
} }
@if %{UseVirtualKeyboard} @if %{UseVirtualKeyboard}

16
share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
View File

@@ -27,8 +27,8 @@
{ "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }, { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" },
{ "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" },
{ "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" }, { "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" },
{ "key": "AdditionalQmlFiles", "value": "HomeForm.ui.qml Page1Form.ui.qml Page2Form.ui.qml" }, { "key": "AdditionalQmlFiles", "value": "HomeForm.qml Page1Form.qml Page2Form.qml" },
{ "key": "AdditionalQmlFilesQbs", "value": ", \"HomeForm.ui.qml\", \"Page1Form.ui.qml\", \"Page2Form.ui.qml\"" } { "key": "AdditionalQmlFilesQbs", "value": ", \"HomeForm.qml\", \"Page1Form.qml\", \"Page2Form.qml\"" }
], ],
@@ -280,16 +280,16 @@
"openInEditor": true "openInEditor": true
}, },
{ {
"source": "HomeForm.ui.qml.tpl", "source": "HomeForm.qml.tpl",
"target": "HomeForm.ui.qml" "target": "HomeForm.qml"
}, },
{ {
"source": "Page1Form.ui.qml.tpl", "source": "Page1Form.qml.tpl",
"target": "Page1Form.ui.qml" "target": "Page1Form.qml"
}, },
{ {
"source": "Page2Form.ui.qml.tpl", "source": "Page2Form.qml.tpl",
"target": "Page2Form.ui.qml" "target": "Page2Form.qml"
}, },
{ {
"source": "../qtquickcontrols2.conf", "source": "../qtquickcontrols2.conf",

0
share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.ui.qml.tpl → share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.qml.tpl
View File

0
share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.ui.qml.tpl → share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl
View File

12
share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
View File

@@ -27,8 +27,8 @@
{ "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }, { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" },
{ "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" },
{ "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" }, { "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" },
{ "key": "AdditionalQmlFiles", "value": "Page1Form.ui.qml Page2Form.ui.qml" }, { "key": "AdditionalQmlFiles", "value": "Page1Form.qml Page2Form.qml" },
{ "key": "AdditionalQmlFilesQbs", "value": ", \"Page1Form.ui.qml\", \"Page2Form.ui.qml\"" } { "key": "AdditionalQmlFilesQbs", "value": ", \"Page1Form.qml\", \"Page2Form.qml\"" }
], ],
"pages": "pages":
@@ -279,12 +279,12 @@
"openInEditor": true "openInEditor": true
}, },
{ {
"source": "Page1Form.ui.qml.tpl", "source": "Page1Form.qml.tpl",
"target": "Page1Form.ui.qml" "target": "Page1Form.qml"
}, },
{ {
"source": "Page2Form.ui.qml.tpl", "source": "Page2Form.qml.tpl",
"target": "Page2Form.ui.qml" "target": "Page2Form.qml"
}, },
{ {
"source": "../qtquickcontrols2.conf", "source": "../qtquickcontrols2.conf",