diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-14 09:32:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-14 09:32:17 +0100 |
| commit | 4255493881c09c4d9b53957ef6fa857dddf70ba3 (patch) | |
| tree | 157bd598d0084707251670e32ce8496d295507a6 /src/plugins/qtsupport | |
| parent | 8fc7dac7611de5fa85e2bd9afe8aa1c72d19e804 (diff) | |
| parent | ae3b9042c96f195500cb9e89b21a9e8f5d70345a (diff) | |
| download | qt-creator-4255493881c09c4d9b53957ef6fa857dddf70ba3.tar.gz | |
Merge remote-tracking branch 'origin/3.6'
Change-Id: Ia5e169a276e21db59b4b26a1ed3f253bff9e2ab9
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index d1774952db..62675294f0 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -453,6 +453,12 @@ QSet<Id> 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; } |