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

Wizards: Adapt QtQuickPrototype wizard to recent template changes

Browse Source 
Handle the new isQt6 property.

amends: 77fed0b0fd

Task-number: QTCREATORBUG-26373
Change-Id: Iff6fb8f91954aa116b8f1c461c7db45f321325fd
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Alessandro Portale
2021-10-06 11:06:23 +02:00
committed by Kai Koehne
parent d02155f24a
commit f3276a96e9
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@
"options": "options":
[ [
{ "key": "QmlProjectFileName", "value": "%{JS: Util.fileName(value('ProjectDirectory') + '/' + value('ProjectName'), 'qmlproject')}" }, { "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": "MainQmlFileName", "value": "%{JS: Util.fileName(value('ProjectName'), 'qml')}" },
{ "key": "QtQuickVersion", "value": "%{JS: value('QtVersion').QtQuickVersion}" }, { "key": "QtQuickVersion", "value": "%{JS: value('QtVersion').QtQuickVersion}" },
{ "key": "QtQuickWindowVersion", "value": "%{JS: value('QtVersion').QtQuickWindowVersion}" }, { "key": "QtQuickWindowVersion", "value": "%{JS: value('QtVersion').QtQuickWindowVersion}" },
@@ -50,7 +51,8 @@
{ {
"QtQuickVersion": "", "QtQuickVersion": "",
"QtQuickWindowVersion": "", "QtQuickWindowVersion": "",
"QtQuickVirtualKeyboardImport": "" "QtQuickVirtualKeyboardImport": "",
"IsQt6": true
} }
}, },
{ {
@@ -59,7 +61,8 @@
{ {
"QtQuickVersion": "2.15", "QtQuickVersion": "2.15",
"QtQuickWindowVersion": "2.15", "QtQuickWindowVersion": "2.15",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15" "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15",
"IsQt6": false
} }
}, },
{ {
@@ -68,7 +71,8 @@
{ {
"QtQuickVersion": "2.14", "QtQuickVersion": "2.14",
"QtQuickWindowVersion": "2.14", "QtQuickWindowVersion": "2.14",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14" "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14",
"IsQt6": false
} }
}, },
{ {
@@ -77,7 +81,8 @@
{ {
"QtQuickVersion": "2.13", "QtQuickVersion": "2.13",
"QtQuickWindowVersion": "2.13", "QtQuickWindowVersion": "2.13",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4",
"IsQt6": false
} }
}, },
{ {
@@ -86,7 +91,8 @@
{ {
"QtQuickVersion": "2.12", "QtQuickVersion": "2.12",
"QtQuickWindowVersion": "2.12", "QtQuickWindowVersion": "2.12",
"QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4",
"IsQt6": false
} }
} }
] ]