diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
| commit | b5e75222373db078591f1e55642a771139fb4e4f (patch) | |
| tree | 077fdd13d6dcd57dd2cbe05c318b7bbb9f0a7b69 /share/qtcreator/templates | |
| parent | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (diff) | |
| parent | 3726218b5e1311f67f41e56d1355bd35b86d9676 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/pythoneditor/pythoneditorplugin.cpp
Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
Diffstat (limited to 'share/qtcreator/templates')
5 files changed, 50 insertions, 5 deletions
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,10 +80,19 @@ "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,10 +83,19 @@ "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,10 +82,19 @@ "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,10 +82,19 @@ "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,10 +40,19 @@ "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": "({ |