diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2017-11-13 14:37:30 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2017-11-14 13:34:42 +0000 |
commit | 71933a4df86446803a4ace5509f6879f507bb81a (patch) | |
tree | d8e29123e1c85559df4e86a542ce732c11ffb3c6 | |
parent | 92fa3a756ea636899631db21b695064715c83b29 (diff) |
QtQuick wizards: Add 5.10 to minimal required Qt versions
QtQuickVersion: 2.10
QtQuickControlsVersion: 2.3
QtQuickWindowVersion: 2.10
QtQuickVirtualKeyboardImport: QtQuick.VirtualKeyboard 2.3
Qt 5.9, which is LTS remains preselected.
Change-Id: Ida5c234431af8cf681ad6f8206283f9a4048bcec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
6 files changed, 60 insertions, 5 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json index be53461aad..ecaa1309f9 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json @@ -80,10 +80,19 @@ "type": "ComboBox", "data": { - "index": 0, + "index": 1, "items": [ { + "trKey": "Qt 5.10", + "value": + "{ + 'QtQuickVersion': '2.10', + 'QtQuickWindowVersion': '2.10', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.9", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 8942b94242..5faa66de91 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -80,10 +80,19 @@ "type": "ComboBox", "data": { - "index": 0, + "index": 1, "items": [ { + "trKey": "Qt 5.10", + "value": + "{ + 'QtQuickVersion': '2.10', + 'QtQuickWindowVersion': '2.10', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.9", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index 57c11b5706..ba7fc0c261 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -83,10 +83,19 @@ "visible": false, "data": { - "index": 0, + "index": 1, "items": [ { + "trKey": "Qt 5.10", + "value": + "{ + 'QtQuickVersion': '2.10', + 'QtQuickControlsVersion': '2.3', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.9", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index c0eb00a6a2..3c77af45c0 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -82,10 +82,19 @@ "type": "ComboBox", "data": { - "index": 0, + "index": 1, "items": [ { + "trKey": "Qt 5.10", + "value": + "{ + 'QtQuickVersion': '2.10', + 'QtQuickControlsVersion': '2.3', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.9", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 0bbc126816..d9d3f9b271 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -82,10 +82,19 @@ "type": "ComboBox", "data": { - "index": 0, + "index": 1, "items": [ { + "trKey": "Qt 5.10", + "value": + "{ + 'QtQuickVersion': '2.10', + 'QtQuickControlsVersion': '2.3', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.9", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index ad03858277..285631c96e 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -40,9 +40,19 @@ "type": "ComboBox", "data": { + "index": 1, "items": [ { + "trKey": "Qt 5.10", + "value": + "{ + 'QtQuickVersion': '2.10', + 'QtQuickWindowVersion': '2.10', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.9", "value": "{ |