aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2017-11-13 11:50:17 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2017-11-13 11:34:52 +0000
commit35717ea88e36c737f727f555cda0ebc35d575923 (patch)
treeb6f324ba1ba8ba14b74670512dab0ef797ea477b /src
parentd2784c68053ecbaacfced84161cd7750cbbd9f0f (diff)
QtSupport: Add Qt version specific feature versions
Qt 5.9: Qt Quick Controls 2.2 Qt 5.10 Qt Quick 2.10 Qt Quick Controls 2.3 Change-Id: If683b6a4ec02128120597a2adbdfa10f111f9680 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qtsupport/baseqtversion.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 459d3b4374..beb07aa1c5 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -478,10 +478,17 @@ QSet<Id> BaseQtVersion::availableFeatures() const
return features;
features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 9));
+ features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 2));
if (qtVersion().matches(5, 9))
return features;
+ features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 10));
+ features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 3));
+
+ if (qtVersion().matches(5, 10))
+ return features;
+
return features;
}