From 34f417a2e4176b57c73b9ead92f23af2e39b434f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 13 Feb 2020 13:04:50 +0100 Subject: [PATCH] Qml tooling: Support Qt 5.15 ...and keep the default at 5.12 Change-Id: I15439c2d71a0610971dc39246e8b98e9653b8f04 Reviewed-by: Alessandro Portale --- .../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 ++++++++++- .../designercore/model/texttomodelmerger.cpp | 2 +- src/plugins/qtsupport/baseqtversion.cpp | 6 ++++++ 7 files changed, 57 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 38f68550882..444f22d2de5 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": 2, + "index": 3, "items": [ + { + "trKey": "Qt 5.15", + "value": + { + "QtQuickVersion": "2.15", + "QtQuickWindowVersion": "2.15", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15" + } + }, { "trKey": "Qt 5.14", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index 576e47d3e8a..1ad41e72302 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": 2, + "index": 3, "items": [ + { + "trKey": "Qt 5.15", + "value": + { + "QtQuickVersion": "2.15", + "QtQuickControlsVersion": "2.15", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15" + } + }, { "trKey": "Qt 5.14", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 34eca289d58..e3966ca5231 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": 2, + "index": 3, "items": [ + { + "trKey": "Qt 5.15", + "value": + { + "QtQuickVersion": "2.15", + "QtQuickControlsVersion": "2.15", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15" + } + }, { "trKey": "Qt 5.14", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 5f9a544cfc8..67dd9fb711a 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": 2, + "index": 3, "items": [ + { + "trKey": "Qt 5.15", + "value": + { + "QtQuickVersion": "2.15", + "QtQuickControlsVersion": "2.15", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15" + } + }, { "trKey": "Qt 5.14", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index c1a966b4b2b..ac39bb90be6 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": 2, + "index": 3, "items": [ + { + "trKey": "Qt 5.15", + "value": + { + "QtQuickVersion": "2.15", + "QtQuickWindowVersion": "2.15", + "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15" + } + }, { "trKey": "Qt 5.14", "value": diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index c09895ad918..de07ef230fe 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -80,7 +80,7 @@ QStringList supportedVersionsList() { static const QStringList list = { "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", - "2.10", "2.11", "2.12", "2.13", "2.14" + "2.10", "2.11", "2.12", "2.13", "2.14", "2.15" }; return list; } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 5526402dcd3..c9cb928a1ac 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -485,6 +485,12 @@ QSet BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 14)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 15)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 15)); + + if (qtVersion().matches(5, 15)) + return features; + return features; }