feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FeatureProvider: Remove Feature and FeatureSet

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2015-11-27 11:31:35 +01:00
parent 19ee414446
commit 4b0a8648e4
44 changed files with 141 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidqtversion.cpp
View File

@@ -134,12 +134,12 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
BaseQtVersion::parseMkSpec(evaluator);
}
Core::FeatureSet AndroidQtVersion::availableFeatures() const
QSet<Core::Id> AndroidQtVersion::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(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(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features;
}

2
src/plugins/android/androidqtversion.h
View File

@@ -56,7 +56,7 @@ public:
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const;
Utils::Environment qmakeRunEnvironment() const;
Core::FeatureSet availableFeatures() const;
QSet<Core::Id> availableFeatures() const;
QString platformName() const;
QString platformDisplayName() const;