From 178e57129d9197e938d344de5db443aa1f039f58 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 16 Jul 2019 12:39:02 +0200 Subject: [PATCH] Fix imports in Qt Quick wizards Fix-up of e0d38ae4140d6101b483fde25158fc94b34a3a64 Change-Id: I9f4055647bbf82c89b3282048944bc6ac89faacf Fixes: QTCREATORBUG-22614 Reviewed-by: Alessandro Portale --- .../projects/qtquickapplication/empty/wizard.json | 10 +++++----- .../wizards/projects/qtquickuiprototype/wizard.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 329fc6c14a8..fe284df679d 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -124,7 +124,7 @@ "value": { "QtQuickVersion": "2.9", - "QtQuickWindowVersion": "2.9", + "QtQuickWindowVersion": "2.2", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" } }, @@ -133,7 +133,7 @@ "value": { "QtQuickVersion": "2.8", - "QtQuickWindowVersion": "2.8", + "QtQuickWindowVersion": "2.2", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" } }, @@ -142,7 +142,7 @@ "value": { "QtQuickVersion": "2.7", - "QtQuickWindowVersion": "2.7", + "QtQuickWindowVersion": "2.2", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" } }, @@ -151,8 +151,8 @@ "value": { "QtQuickVersion": "2.6", - "QtQuickWindowVersion": "2.6", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.0" + "QtQuickWindowVersion": "2.2", + "QtQuickVirtualKeyboardImport": "QtQuick.Enterprise.VirtualKeyboard 2.0" } } ] diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 79900ca5571..f5a5abab026 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -84,7 +84,7 @@ "value": { "QtQuickVersion": "2.9", - "QtQuickWindowVersion": "2.9", + "QtQuickWindowVersion": "2.2", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" } }, @@ -93,7 +93,7 @@ "value": { "QtQuickVersion": "2.8", - "QtQuickWindowVersion": "2.8", + "QtQuickWindowVersion": "2.2", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" } }, @@ -102,7 +102,7 @@ "value": { "QtQuickVersion": "2.7", - "QtQuickWindowVersion": "2.7", + "QtQuickWindowVersion": "2.2", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" } }, @@ -111,8 +111,8 @@ "value": { "QtQuickVersion": "2.6", - "QtQuickWindowVersion": "2.6", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.0" + "QtQuickWindowVersion": "2.2", + "QtQuickVirtualKeyboardImport": "QtQuick.Enterprise.VirtualKeyboard 2.0" } } ]