From 52f95bae8b6a7c38b2d183522e1a7e550509d52f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 27 Mar 2019 15:11:39 +0100 Subject: Qml tooling: Support Qt 5.13 and change default to 5.12 QtQuick 2.13 QtQuick.Controls 2.13 QtQuick.Window 2.13 QtQuick.VirtualKeyboard 2.4 Change-Id: Ib977d65294bca522e8ad6b5e1a96b3580a4d4313 Reviewed-by: Tim Jenssen --- .../wizards/projects/qtquickapplication/empty/wizard.json | 11 ++++++++++- .../wizards/projects/qtquickapplication/scroll/wizard.json | 11 ++++++++++- .../wizards/projects/qtquickapplication/stack/wizard.json | 11 ++++++++++- .../wizards/projects/qtquickapplication/swipe/wizard.json | 11 ++++++++++- .../templates/wizards/projects/qtquickuiprototype/wizard.json | 11 ++++++++++- 5 files changed, 50 insertions(+), 5 deletions(-) (limited to 'share/qtcreator/templates/wizards') diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 4ced9e026b..d26bec5ec6 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -80,9 +80,18 @@ "type": "ComboBox", "data": { - "index": 3, + "index": 1, "items": [ + { + "trKey": "Qt 5.13", + "value": + "({ + 'QtQuickVersion': '2.13', + 'QtQuickWindowVersion': '2.13', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + })" + }, { "trKey": "Qt 5.12", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index 656f5d3596..b19188a3c8 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -83,9 +83,18 @@ "visible": false, "data": { - "index": 3, + "index": 1, "items": [ + { + "trKey": "Qt 5.13", + "value": + "({ + 'QtQuickVersion': '2.13', + 'QtQuickControlsVersion': '2.13', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + })" + }, { "trKey": "Qt 5.12", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 99cf484850..0b0f8558ac 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -82,9 +82,18 @@ "type": "ComboBox", "data": { - "index": 3, + "index": 1, "items": [ + { + "trKey": "Qt 5.13", + "value": + "({ + 'QtQuickVersion': '2.13', + 'QtQuickControlsVersion': '2.13', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + })" + }, { "trKey": "Qt 5.12", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index f5918f35e0..a89e6cce26 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -82,9 +82,18 @@ "type": "ComboBox", "data": { - "index": 3, + "index": 1, "items": [ + { + "trKey": "Qt 5.13", + "value": + "({ + 'QtQuickVersion': '2.13', + 'QtQuickControlsVersion': '2.13', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + })" + }, { "trKey": "Qt 5.12", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 89dbe871d6..7d059b8d4c 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -40,9 +40,18 @@ "type": "ComboBox", "data": { - "index": 3, + "index": 1, "items": [ + { + "trKey": "Qt 5.13", + "value": + "({ + 'QtQuickVersion': '2.13', + 'QtQuickWindowVersion': '2.13', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4' + })" + }, { "trKey": "Qt 5.12", "value": -- cgit v1.2.1