From 1e80ed9b786070962c16ad0417a3cedf5673e1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 6 May 2021 17:18:28 +0200 Subject: [PATCH] Qt Quick Wizards: Remove Qt versions older than Qt 5.12 That doesn't mean we don't support older versions. But I don't think we should advertise creating new projects for it. Change-Id: Ia9b97cc072232238baffd10b159f604f1a6413d1 Reviewed-by: Eike Ziller --- .../qtquickapplication/empty/wizard.json | 54 ------------------- .../qtquickapplication/scroll/wizard.json | 31 +---------- .../qtquickapplication/stack/wizard.json | 49 +---------------- .../qtquickapplication/swipe/wizard.json | 49 +---------------- .../projects/qtquickuiprototype/wizard.json | 54 ------------------- 5 files changed, 6 insertions(+), 231 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index dae4a36ef20..2cf267e30de 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -130,60 +130,6 @@ "QtQuickWindowVersion": "2.12", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" } - }, - { - "trKey": "Qt 5.11", - "value": - { - "QtQuickVersion": "2.11", - "QtQuickWindowVersion": "2.11", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.10", - "value": - { - "QtQuickVersion": "2.10", - "QtQuickWindowVersion": "2.10", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.9", - "value": - { - "QtQuickVersion": "2.9", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" - } - }, - { - "trKey": "Qt 5.8", - "value": - { - "QtQuickVersion": "2.8", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.7", - "value": - { - "QtQuickVersion": "2.7", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.6", - "value": - { - "QtQuickVersion": "2.6", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.Enterprise.VirtualKeyboard 2.0" - } } ] } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index 3106441dd99..0626e663e5c 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -132,33 +132,6 @@ "QtQuickControlsVersion": "2.5", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" } - }, - { - "trKey": "Qt 5.11", - "value": - { - "QtQuickVersion": "2.11", - "QtQuickControlsVersion": "2.4", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.10", - "value": - { - "QtQuickVersion": "2.10", - "QtQuickControlsVersion": "2.3", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.9", - "value": - { - "QtQuickVersion": "2.9", - "QtQuickControlsVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" - } } ] } @@ -221,7 +194,7 @@ } }, { - "trKey": "Fusion (Qt 5.10+)", + "trKey": "Fusion", "value": { "QtQuickControlsStyle": "Fusion", @@ -229,7 +202,7 @@ } }, { - "trKey": "Imagine (Qt 5.10+)", + "trKey": "Imagine", "value": { "QtQuickControlsStyle": "Imagine", diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 4fef77d51d7..6a96a9116bf 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -133,51 +133,6 @@ "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" } }, - { - "trKey": "Qt 5.11", - "value": - { - "QtQuickVersion": "2.11", - "QtQuickControlsVersion": "2.4", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.10", - "value": - { - "QtQuickVersion": "2.10", - "QtQuickControlsVersion": "2.3", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.9", - "value": - { - "QtQuickVersion": "2.9", - "QtQuickControlsVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" - } - }, - { - "trKey": "Qt 5.8", - "value": - { - "QtQuickVersion": "2.8", - "QtQuickControlsVersion": "2.1", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.7", - "value": - { - "QtQuickVersion": "2.7", - "QtQuickControlsVersion": "2.0", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - } ] } }, @@ -239,7 +194,7 @@ } }, { - "trKey": "Fusion (Qt 5.10+)", + "trKey": "Fusion", "value": { "QtQuickControlsStyle": "Fusion", @@ -247,7 +202,7 @@ } }, { - "trKey": "Imagine (Qt 5.10+)", + "trKey": "Imagine", "value": { "QtQuickControlsStyle": "Imagine", diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index add12435030..821c85b2dd2 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -132,51 +132,6 @@ "QtQuickControlsVersion": "2.5", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" } - }, - { - "trKey": "Qt 5.11", - "value": - { - "QtQuickVersion": "2.11", - "QtQuickControlsVersion": "2.4", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.10", - "value": - { - "QtQuickVersion": "2.10", - "QtQuickControlsVersion": "2.3", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.9", - "value": - { - "QtQuickVersion": "2.9", - "QtQuickControlsVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" - } - }, - { - "trKey": "Qt 5.8", - "value": - { - "QtQuickVersion": "2.8", - "QtQuickControlsVersion": "2.1", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.7", - "value": - { - "QtQuickVersion": "2.7", - "QtQuickControlsVersion": "2.0", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } } ] } @@ -239,7 +194,7 @@ } }, { - "trKey": "Fusion (Qt 5.10+)", + "trKey": "Fusion", "value": { "QtQuickControlsStyle": "Fusion", @@ -247,7 +202,7 @@ } }, { - "trKey": "Imagine (Qt 5.10+)", + "trKey": "Imagine", "value": { "QtQuickControlsStyle": "Imagine", diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 96cd94dad53..d5642f0a987 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -87,60 +87,6 @@ "QtQuickWindowVersion": "2.12", "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4" } - }, - { - "trKey": "Qt 5.11", - "value": - { - "QtQuickVersion": "2.11", - "QtQuickWindowVersion": "2.11", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.10", - "value": - { - "QtQuickVersion": "2.10", - "QtQuickWindowVersion": "2.10", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.3" - } - }, - { - "trKey": "Qt 5.9", - "value": - { - "QtQuickVersion": "2.9", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.2" - } - }, - { - "trKey": "Qt 5.8", - "value": - { - "QtQuickVersion": "2.8", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.7", - "value": - { - "QtQuickVersion": "2.7", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.1" - } - }, - { - "trKey": "Qt 5.6", - "value": - { - "QtQuickVersion": "2.6", - "QtQuickWindowVersion": "2.2", - "QtQuickVirtualKeyboardImport": "QtQuick.Enterprise.VirtualKeyboard 2.0" - } } ] }