diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json index ecaa1309f99..3038b29b1cc 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json @@ -80,9 +80,18 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickWindowVersion': '2.11', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, { "trKey": "Qt 5.10", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 5faa66de910..c2542d5c0ac 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -80,9 +80,18 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickWindowVersion': '2.11', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, { "trKey": "Qt 5.10", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index ba7fc0c2616..ed6f8769237 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -83,9 +83,18 @@ "visible": false, "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickControlsVersion': '2.4', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, { "trKey": "Qt 5.10", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 3c77af45c06..dec5441fa93 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -82,9 +82,18 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickControlsVersion': '2.4', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, { "trKey": "Qt 5.10", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index d9d3f9b2712..1867cf37570 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -82,9 +82,18 @@ "type": "ComboBox", "data": { - "index": 1, + "index": 2, "items": [ + { + "trKey": "Qt 5.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickControlsVersion': '2.4', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, { "trKey": "Qt 5.10", "value": diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 62305835df1..9b748cf3d75 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.11", + "value": + "{ + 'QtQuickVersion': '2.11', + 'QtQuickWindowVersion': '2.11', + 'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3' + }" + }, { "trKey": "Qt 5.10", "value": diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index bbcbe35d83e..18a54758517 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -74,7 +74,7 @@ static inline bool isSupportedAttachedProperties(const QString &propertyName) static inline 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.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11" }; return list; } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index cb38340e7c5..12941ee0d23 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -413,6 +413,12 @@ QSet BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 10)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 11)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 4)); + + if (qtVersion().matches(5, 11)) + return features; + return features; }