summaryrefslogtreecommitdiff
path: root/src/plugins/qtsupport/desktopqtversion.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/qtsupport/desktopqtversion.cpp
parent19ee414446aae4dc65022e2c7c364a37c98c4f80 (diff)
downloadqt-creator-4b0a8648e4e1a2001367442525b4d57f92b61bd8.tar.gz
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/qtsupport/desktopqtversion.cpp')
-rw-r--r--src/plugins/qtsupport/desktopqtversion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp
index 01658dd1bd..b71bb709b8 100644
--- a/src/plugins/qtsupport/desktopqtversion.cpp
+++ b/src/plugins/qtsupport/desktopqtversion.cpp
@@ -82,11 +82,11 @@ QString DesktopQtVersion::description() const
return QCoreApplication::translate("QtVersion", "Desktop", "Qt Version is meant for the desktop");
}
-Core::FeatureSet DesktopQtVersion::availableFeatures() const
+QSet<Core::Id> DesktopQtVersion::availableFeatures() const
{
- Core::FeatureSet features = BaseQtVersion::availableFeatures();
- features |= Core::FeatureSet(Constants::FEATURE_DESKTOP);
- features |= Core::Feature(Constants::FEATURE_QMLPROJECT);
+ QSet<Core::Id> features = BaseQtVersion::availableFeatures();
+ features.insert(Constants::FEATURE_DESKTOP);
+ features.insert(Constants::FEATURE_QMLPROJECT);
return features;
}