aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2021-10-06 11:06:23 +0200
committerKai Koehne <kai.koehne@qt.io>2021-10-06 13:21:33 +0000
commitf3276a96e9d1b9c04fe8ff0b4ea37b126128f00b (patch)
tree7dbb0872fa6e134567cfd3c4d43506523451b240
parentd02155f24a918d02d4ddcdde8cc7e6f11fcce5b8 (diff)
Wizards: Adapt QtQuickPrototype wizard to recent template changes
Handle the new isQt6 property. amends: 77fed0b0fdce2a93f465c20cd87c41900117dcda Task-number: QTCREATORBUG-26373 Change-Id: Iff6fb8f91954aa116b8f1c461c7db45f321325fd Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json16
1 files changed, 11 insertions, 5 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
index 366ec1e4cd..78dbbd9956 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -14,6 +14,7 @@
"options":
[
{ "key": "QmlProjectFileName", "value": "%{JS: Util.fileName(value('ProjectDirectory') + '/' + value('ProjectName'), 'qmlproject')}" },
+ { "key": "IsQt6", "value": "%{JS: value('QtVersion').IsQt6}" },
{ "key": "MainQmlFileName", "value": "%{JS: Util.fileName(value('ProjectName'), 'qml')}" },
{ "key": "QtQuickVersion", "value": "%{JS: value('QtVersion').QtQuickVersion}" },
{ "key": "QtQuickWindowVersion", "value": "%{JS: value('QtVersion').QtQuickWindowVersion}" },
@@ -50,7 +51,8 @@
{
"QtQuickVersion": "",
"QtQuickWindowVersion": "",
- "QtQuickVirtualKeyboardImport": ""
+ "QtQuickVirtualKeyboardImport": "",
+ "IsQt6": true
}
},
{
@@ -59,7 +61,8 @@
{
"QtQuickVersion": "2.15",
"QtQuickWindowVersion": "2.15",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15"
+ "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15",
+ "IsQt6": false
}
},
{
@@ -68,7 +71,8 @@
{
"QtQuickVersion": "2.14",
"QtQuickWindowVersion": "2.14",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14"
+ "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14",
+ "IsQt6": false
}
},
{
@@ -77,7 +81,8 @@
{
"QtQuickVersion": "2.13",
"QtQuickWindowVersion": "2.13",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4"
+ "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4",
+ "IsQt6": false
}
},
{
@@ -86,7 +91,8 @@
{
"QtQuickVersion": "2.12",
"QtQuickWindowVersion": "2.12",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4"
+ "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4",
+ "IsQt6": false
}
}
]