diff options
| author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-07-06 11:15:18 +0000 |
| commit | e1c88116b397ecac2ef0f0678a419790a3e40402 (patch) | |
| tree | 830be4b2f1aabad0522c7e01287ec9197b55e4cf /src/plugins/android/androidqtversion.cpp | |
| parent | c9eedbe0f387f33e5e455af03a795d2114528543 (diff) | |
| download | qt-creator-e1c88116b397ecac2ef0f0678a419790a3e40402.tar.gz | |
Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.
Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/android/androidqtversion.cpp')
| -rw-r--r-- | src/plugins/android/androidqtversion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index ef1f8328cf..0a3f80e75f 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -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}; } |