aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/winrt/winrtqtversion.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-11-27 11:31:35 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-12-02 14:49:17 +0000
commit4b0a8648e4e1a2001367442525b4d57f92b61bd8 (patch)
treef9ddd96378b8077daa2be1e3c3d5beeba943a33b /src/plugins/winrt/winrtqtversion.cpp
parent19ee414446aae4dc65022e2c7c364a37c98c4f80 (diff)
FeatureProvider: Remove Feature and FeatureSet
Use Core::Id for Feature and QSet<Core::Id> for FeatureSet. Change-Id: I12341036bd9eaa82589d92bd3f7d21f2e6b737bd Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/winrt/winrtqtversion.cpp')
-rw-r--r--src/plugins/winrt/winrtqtversion.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp
index 07728e6845..d899da3bff 100644
--- a/src/plugins/winrt/winrtqtversion.cpp
+++ b/src/plugins/winrt/winrtqtversion.cpp
@@ -64,13 +64,13 @@ QString WinRtQtVersion::description() const
return tr("Windows Runtime");
}
-Core::FeatureSet WinRtQtVersion::availableFeatures() const
+QSet<Core::Id> WinRtQtVersion::availableFeatures() const
{
- Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
- features |= Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE);
- features.remove(Core::Feature(QtSupport::Constants::FEATURE_QT_CONSOLE));
- features.remove(Core::Feature::versionedFeature(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
- features.remove(Core::Feature(QtSupport::Constants::FEATURE_QT_WEBKIT));
+ QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+ features.insert(QtSupport::Constants::FEATURE_MOBILE);
+ features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
+ features.remove(Core::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
+ features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features;
}