diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2018-04-11 18:53:09 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-04-12 09:16:21 +0000 |
| commit | b3d291d2309d10f9e9e22dd74ba0906f99d7e751 (patch) | |
| tree | 7b5f10140079ef1c431f462d0cb62e1a992b3f52 /share | |
| parent | 63a4654a8e944babe993379541cebe7ad8c09bb6 (diff) | |
| download | qt-creator-b3d291d2309d10f9e9e22dd74ba0906f99d7e751.tar.gz | |
Qml tooling: Support Qt 5.11
QtQuick 2.11
QtQuick.Controls 2.4
QtQuick.Window 2.11
Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
6 files changed, 60 insertions, 6 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json index ecaa1309f9..3038b29b1c 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": 1, + "index": 2, "items": [ { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickWindowVersion': '2.11', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.10", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 5faa66de91..c2542d5c0a 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": 1, + "index": 2, "items": [ { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickWindowVersion': '2.11', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.10", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index ba7fc0c261..ed6f876923 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": 1, + "index": 2, "items": [ { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickControlsVersion': '2.4', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.10", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 3c77af45c0..dec5441fa9 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": 1, + "index": 2, "items": [ { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickControlsVersion': '2.4', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.10", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index d9d3f9b271..1867cf3757 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": 1, + "index": 2, "items": [ { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickControlsVersion': '2.4', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.10", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 62305835df..9b748cf3d7 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -40,10 +40,19 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickWindowVersion': '2.11', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, + { "trKey": "Qt 5.10", "value": "{ |