diff options
3 files changed, 24 insertions, 0 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json index dd19ca5f37..ce46861c19 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json @@ -44,6 +44,14 @@ "items": [ { + "trKey": "Qt 5.6", + "value": + "{ + 'qtQuickVersion': '2.6', + 'qtQuickWindowVersion': '2.2' + }" + }, + { "trKey": "Qt 5.5", "value": "{ diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json index 4e715b5111..6d4119a1fe 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json @@ -46,6 +46,16 @@ "items": [ { + "trKey": "Qt 5.6", + "value": + "{ + 'qtQuickVersion': '2.6', + 'qtQuickControlsVersion': '1.5', + 'qtQuickDialogsVersion': '1.2', + 'qtQuickLayoutsVersion': '1.3' + }" + }, + { "trKey": "Qt 5.5", "value": "{ diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 4b3ef96f1e..8cfbcf161b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -429,6 +429,12 @@ FeatureSet BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 5)) return features; + features |= FeatureSet::versionedFeatures(Constants::FEATURE_QT_QUICK_PREFIX, 2, 6); + features |= FeatureSet::versionedFeatures(Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1, 5); + + if (qtVersion().matches(5, 6)) + return features; + return features; } |