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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent c9eedbe0f3
commit e1c88116b3
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,16 +182,16 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
BaseQtVersion::parseMkSpec(evaluator);
}
QSet<Core::Id> AndroidQtVersion::availableFeatures() const
QSet<Utils::Id> AndroidQtVersion::availableFeatures() const
{
QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
QSet<Utils::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;
}
QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
QSet<Utils::Id> AndroidQtVersion::targetDeviceTypes() const
{
return {Constants::ANDROID_DEVICE_TYPE};
}