summaryrefslogtreecommitdiff
path: root/src/plugins/qtsupport
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-01-06 11:43:50 +0100
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-01-08 13:31:38 +0000
commit0118bc290a39e5fe8d9aeae3cff7cbca62a1e5d9 (patch)
treec8122a37cb1e320a5e9e986b5d5aeb59a34c0f6d /src/plugins/qtsupport
parentb7eafe9512ce448719b15fc3f337c8b5717bb93a (diff)
downloadqt-creator-0118bc290a39e5fe8d9aeae3cff7cbca62a1e5d9.tar.gz
Qt Quick Application Wizards: Add Qt 5.6
...also for qmake based projects Change-Id: Ib8cab74a8b2249a13175593b27f228b4c7bc0052 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport')
-rw-r--r--src/plugins/qtsupport/baseqtversion.cpp6
1 files changed, 6 insertions, 0 deletions
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;
}