summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2019-03-27 15:11:39 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2019-03-28 08:03:25 +0000
commit52f95bae8b6a7c38b2d183522e1a7e550509d52f (patch)
treedeb2e8357964e6fbf746ab668669eadf775f2469 /share
parenta13a70fd180aeb0a6e57d8e784c302ee0b04d514 (diff)
downloadqt-creator-52f95bae8b6a7c38b2d183522e1a7e550509d52f.tar.gz
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 <tim.jenssen@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json11
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json11
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json11
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json11
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json11
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":
"({