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

QmlDesigner.Wizards: Extend version combobox

Browse Source 
This patch allows to distinguish between 6.2 and 6.3.

Change-Id: I9ba4c9984673e9e9e6f7d50a1ea35704f7e00211
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2022-05-24 16:59:08 +02:00
parent d92bdcce40
commit e2f20ddcd5
8 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml
View File

@@ -414,14 +414,15 @@ Item {
SC.ComboBox { // Target Qt Version ComboBox SC.ComboBox { // Target Qt Version ComboBox
id: qtVersionComboBox id: qtVersionComboBox
actionIndicatorVisible: false actionIndicatorVisible: false
implicitWidth: 70 implicitWidth: 82
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
currentIndex: BackendApi.targetQtVersionIndex currentIndex: BackendApi.targetQtVersionIndex
font.pixelSize: DialogValues.defaultPixelSize font.pixelSize: DialogValues.defaultPixelSize
model: ListModel { model: ListModel {
ListElement { name: "Qt 5" } ListElement { name: "Qt 5.15" }
ListElement { name: "Qt 6" } ListElement { name: "Qt 6.2" }
ListElement { name: "Qt 6.3" }
} }
onActivated: (index) => { onActivated: (index) => {

17
share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
View File

@@ -236,23 +236,28 @@
"type": "ComboBox", "type": "ComboBox",
"data": "data":
{ {
"index": 1, "index": 2,
"items": "items":
[ [
{ {
"trKey": "Qt 5", "trKey": "Qt 5",
"value": "value":
"({ "({
'TargetQuickVersion': '2.15', 'TargetQuickVersion': '2.15'
'TargetQuick3DVersion': '1.15'
})" })"
}, },
{ {
"trKey": "Qt 6", "trKey": "Qt 6.2",
"value": "value":
"({ "({
'TargetQuickVersion': '', 'TargetQuickVersion': '6.2'
'TargetQuick3DVersion': '' })"
},
{
"trKey": "Qt 6.3",
"value":
"({
'TargetQuickVersion': '6.3'
})" })"
} }
] ]

11
share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
View File

@@ -249,10 +249,17 @@
})" })"
}, },
{ {
"trKey": "Qt 6", "trKey": "Qt 6.2",
"value": "value":
"({ "({
'TargetQuickVersion': '' 'TargetQuickVersion': '6.2'
})"
},
{
"trKey": "Qt 6.3",
"value":
"({
'TargetQuickVersion': '6.3'
})" })"
} }
] ]

2
share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl
View File

@@ -92,6 +92,8 @@ Project {
qdsVersion: "3.4" qdsVersion: "3.4"
quickVersion: "%{QtQuickVersion}"
@if %{IsQt6Project} @if %{IsQt6Project}
/* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */ /* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */
widgetApp: true widgetApp: true

12
share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
View File

@@ -235,6 +235,7 @@
"data": "data":
{ {
"index": 1, "index": 1,
"items":
"items": "items":
[ [
{ {
@@ -245,10 +246,17 @@
})" })"
}, },
{ {
"trKey": "Qt 6", "trKey": "Qt 6.2",
"value": "value":
"({ "({
'TargetQuickVersion': '' 'TargetQuickVersion': '6.2'
})"
},
{
"trKey": "Qt 6.3",
"value":
"({
'TargetQuickVersion': '6.3'
})" })"
} }
] ]

11
share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
View File

@@ -204,10 +204,17 @@
})" })"
}, },
{ {
"trKey": "Qt 6", "trKey": "Qt 6.2",
"value": "value":
"({ "({
'TargetQuickVersion': '' 'TargetQuickVersion': '6.2'
})"
},
{
"trKey": "Qt 6.3",
"value":
"({
'TargetQuickVersion': '6.3'
})" })"
} }
] ]

11
share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
View File

@@ -202,10 +202,17 @@
})" })"
}, },
{ {
"trKey": "Qt 6", "trKey": "Qt 6.2",
"value": "value":
"({ "({
'TargetQuickVersion': '' 'TargetQuickVersion': '6.2'
})"
},
{
"trKey": "Qt 6.3",
"value":
"({
'TargetQuickVersion': '6.3'
})" })"
} }
] ]

11
share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
View File

@@ -202,10 +202,17 @@
})" })"
}, },
{ {
"trKey": "Qt 6", "trKey": "Qt 6.2",
"value": "value":
"({ "({
'TargetQuickVersion': '' 'TargetQuickVersion': '6.2'
})"
},
{
"trKey": "Qt 6.3",
"value":
"({
'TargetQuickVersion': '6.3'
})" })"
} }
] ]