From dea46dd04eabf654638e335fb96f0552d01004a9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 30 Sep 2019 19:06:31 +0200 Subject: [PATCH] Qml tooling: Support Qt 5.14 QtQuick 2.14 QtQuick.Controls 2.14 QtQuick.Window 2.14 QtQuick.VirtualKeyboard 2.14 Change-Id: Ide447cf8f5beae481495e6c7220dfc075d6e859f Reviewed-by: Thomas Hartmann --- .../projects/qtquickapplication/empty/wizard.json | 11 ++++++++++- .../projects/qtquickapplication/scroll/wizard.json | 11 ++++++++++- .../projects/qtquickapplication/stack/wizard.json | 11 ++++++++++- .../projects/qtquickapplication/swipe/wizard.json | 11 ++++++++++- .../wizards/projects/qtquickuiprototype/wizard.json | 11 ++++++++++- src/plugins/qtsupport/baseqtversion.cpp | 6 ++++++ 6 files changed, 56 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 04fa9bbb7d8..20feee368c2 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -83,9 +83,18 @@ "persistenceKey": "QtQuick.minimumQtVersion", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.14", + "value": + { + "QtQuickVersion": "2.14", + "QtQuickWindowVersion": "2.14", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14" + } + }, { "trKey": "Qt 5.13", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index 1fa633f83d1..0b9a23b714d 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -85,9 +85,18 @@ "persistenceKey": "QtQuick.minimumQtVersion", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.14", + "value": + { + "QtQuickVersion": "2.14", + "QtQuickControlsVersion": "2.14", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14" + } + }, { "trKey": "Qt 5.13", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 59ea4db3131..012cc1530bd 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -85,9 +85,18 @@ "persistenceKey": "QtQuick.minimumQtVersion", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.14", + "value": + { + "QtQuickVersion": "2.14", + "QtQuickControlsVersion": "2.14", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14" + } + }, { "trKey": "Qt 5.13", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index b2e90419b48..2b8c3f74ee1 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -85,9 +85,18 @@ "persistenceKey": "QtQuick.minimumQtVersion", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.14", + "value": + { + "QtQuickVersion": "2.14", + "QtQuickControlsVersion": "2.14", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14" + } + }, { "trKey": "Qt 5.13", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index f5a5abab026..c1a966b4b2b 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -40,9 +40,18 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.14", + "value": + { + "QtQuickVersion": "2.14", + "QtQuickWindowVersion": "2.14", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14" + } + }, { "trKey": "Qt 5.13", "value": diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 88a406eda97..ed0e145e56d 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -449,6 +449,12 @@ QSet BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 13)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 14)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 14)); + + if (qtVersion().matches(5, 14)) + return features; + return features; }