From e2f20ddcd5f515d39d1eb5ae0d13b766ddfa73b6 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 24 May 2022 16:59:08 +0200 Subject: [PATCH] QmlDesigner.Wizards: Extend version combobox This patch allows to distinguish between 6.2 and 6.3. Change-Id: I9ba4c9984673e9e9e6f7d50a1ea35704f7e00211 Reviewed-by: Samuel Ghinet Reviewed-by: Thomas Hartmann --- .../imports/NewProjectDialog/Details.qml | 7 ++++--- .../projects/application-3d/wizard.json | 17 +++++++++++------ .../projects/application/wizard.json | 11 +++++++++-- .../projects/common/app.qmlproject.tpl | 2 ++ .../projects/desktop-launcher/wizard.json | 12 ++++++++++-- .../projects/mobile-scroll/wizard.json | 11 +++++++++-- .../projects/mobile-stack/wizard.json | 11 +++++++++-- .../projects/mobile-swipe/wizard.json | 11 +++++++++-- 8 files changed, 63 insertions(+), 19 deletions(-) diff --git a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml index 1f154810b00..a5ba5afdb3e 100644 --- a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml +++ b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml @@ -414,14 +414,15 @@ Item { SC.ComboBox { // Target Qt Version ComboBox id: qtVersionComboBox actionIndicatorVisible: false - implicitWidth: 70 + implicitWidth: 82 Layout.alignment: Qt.AlignRight currentIndex: BackendApi.targetQtVersionIndex font.pixelSize: DialogValues.defaultPixelSize model: ListModel { - ListElement { name: "Qt 5" } - ListElement { name: "Qt 6" } + ListElement { name: "Qt 5.15" } + ListElement { name: "Qt 6.2" } + ListElement { name: "Qt 6.3" } } onActivated: (index) => { diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json index c35f10da210..ae3719243e6 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json @@ -236,23 +236,28 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ { "trKey": "Qt 5", "value": "({ - 'TargetQuickVersion': '2.15', - 'TargetQuick3DVersion': '1.15' + 'TargetQuickVersion': '2.15' })" }, { - "trKey": "Qt 6", + "trKey": "Qt 6.2", "value": "({ - 'TargetQuickVersion': '', - 'TargetQuick3DVersion': '' + 'TargetQuickVersion': '6.2' + })" + }, + { + "trKey": "Qt 6.3", + "value": + "({ + 'TargetQuickVersion': '6.3' })" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json index accd83efdf4..51acc18af26 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json @@ -249,10 +249,17 @@ })" }, { - "trKey": "Qt 6", + "trKey": "Qt 6.2", "value": "({ - 'TargetQuickVersion': '' + 'TargetQuickVersion': '6.2' + })" + }, + { + "trKey": "Qt 6.3", + "value": + "({ + 'TargetQuickVersion': '6.3' })" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl index d8aa87ee92d..3d2490e8d9c 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl @@ -92,6 +92,8 @@ Project { qdsVersion: "3.4" + quickVersion: "%{QtQuickVersion}" + @if %{IsQt6Project} /* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */ widgetApp: true diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json index bdf4873fa09..f687b2ce385 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json @@ -235,6 +235,7 @@ "data": { "index": 1, + "items": "items": [ { @@ -245,10 +246,17 @@ })" }, { - "trKey": "Qt 6", + "trKey": "Qt 6.2", "value": "({ - 'TargetQuickVersion': '' + 'TargetQuickVersion': '6.2' + })" + }, + { + "trKey": "Qt 6.3", + "value": + "({ + 'TargetQuickVersion': '6.3' })" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json index 6009869a8df..d12fc38bdc4 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json @@ -204,10 +204,17 @@ })" }, { - "trKey": "Qt 6", + "trKey": "Qt 6.2", "value": "({ - 'TargetQuickVersion': '' + 'TargetQuickVersion': '6.2' + })" + }, + { + "trKey": "Qt 6.3", + "value": + "({ + 'TargetQuickVersion': '6.3' })" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json index 53c389177f0..1b76c290359 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json @@ -202,10 +202,17 @@ })" }, { - "trKey": "Qt 6", + "trKey": "Qt 6.2", "value": "({ - 'TargetQuickVersion': '' + 'TargetQuickVersion': '6.2' + })" + }, + { + "trKey": "Qt 6.3", + "value": + "({ + 'TargetQuickVersion': '6.3' })" } ] diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json index 065d2783427..19e5865fb83 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json @@ -202,10 +202,17 @@ })" }, { - "trKey": "Qt 6", + "trKey": "Qt 6.2", "value": "({ - 'TargetQuickVersion': '' + 'TargetQuickVersion': '6.2' + })" + }, + { + "trKey": "Qt 6.3", + "value": + "({ + 'TargetQuickVersion': '6.3' })" } ]