diff options
Diffstat (limited to 'share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json')
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json | 62 |
1 files changed, 13 insertions, 49 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 4f7e8f1479..3e44affe58 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -22,7 +22,7 @@ { "key": "QtQuickVirtualKeyboardImport", "value": "%{JS: value('QtVersion').QtQuickVirtualKeyboardImport}" }, { "key": "QtQuickControlsStyle", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyle}" }, { "key": "QtQuickControlsStyleTheme", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyleTheme}" }, - { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }, + { "key": "QtQuickFeature", "value": "%{JS: (value('QtQuickVersion')=='') ? 'QtSupport.Wizards.FeatureQtQuick.6' : 'QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}'}" }, { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }, { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" }, { "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" } @@ -85,10 +85,19 @@ "persistenceKey": "QtQuick.minimumQtVersion", "data": { - "index": 3, + "index": 1, "items": [ { + "trKey": "Qt 6", + "value": + { + "QtQuickVersion": "", + "QtQuickControlsVersion": "", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard" + } + }, + { "trKey": "Qt 5.15", "value": { @@ -123,51 +132,6 @@ "QtQuickControlsVersion": "2.5", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" } - }, - { - "trKey": "Qt 5.11", - "value": - { - "QtQuickVersion": "2.11", - "QtQuickControlsVersion": "2.4", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.10", - "value": - { - "QtQuickVersion": "2.10", - "QtQuickControlsVersion": "2.3", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.9", - "value": - { - "QtQuickVersion": "2.9", - "QtQuickControlsVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" - } - }, - { - "trKey": "Qt 5.8", - "value": - { - "QtQuickVersion": "2.8", - "QtQuickControlsVersion": "2.1", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.7", - "value": - { - "QtQuickVersion": "2.7", - "QtQuickControlsVersion": "2.0", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } } ] } @@ -222,7 +186,7 @@ } }, { - "trKey": "Fusion (Qt 5.10+)", + "trKey": "Fusion", "value": { "QtQuickControlsStyle": "Fusion", @@ -230,7 +194,7 @@ } }, { - "trKey": "Imagine (Qt 5.10+)", + "trKey": "Imagine", "value": { "QtQuickControlsStyle": "Imagine", |