diff options
author | hjk <hjk@qt.io> | 2019-06-21 08:40:47 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-03 15:39:59 +0000 |
commit | 9b0feb726e3dc96aceef659bd246f0cd744b9cbc (patch) | |
tree | 844f085c04e5099df5b2afdbe269c764679b50c1 /src/plugins/ios | |
parent | 6f6949125a80c438d93a57a8e13b34f59f3d5568 (diff) |
Use more toList/toSet to avoid deprecation warnings
Change-Id: I43575a54ff944bf0e89d452d13944fcaee270208
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/ios')
-rw-r--r-- | src/plugins/ios/iosconfigurations.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 6b4c244386f..a1d13c115a5 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -167,11 +167,11 @@ static QHash<XcodePlatform::ToolchainTarget, ToolChainPair> findToolChains(const static QSet<Kit *> existingAutoDetectedIosKits() { - return Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool { + return Utils::toSet(Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool { Core::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit); return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE || deviceKind == Constants::IOS_SIMULATOR_TYPE); - }).toSet(); + })); } static void printKits(const QSet<Kit *> &kits) @@ -249,9 +249,9 @@ void IosConfigurations::updateAutomaticKitList() // target -> tool chain const auto targetToolChainHash = findToolChains(platforms); - const auto qtVersions = QtVersionManager::versions([](const BaseQtVersion *v) { + const auto qtVersions = Utils::toSet(QtVersionManager::versions([](const BaseQtVersion *v) { return v->isValid() && v->type() == Constants::IOSQT; - }).toSet(); + })); const DebuggerItem *possibleDebugger = DebuggerItemManager::findByEngineType(LldbEngineType); const QVariant debuggerId = (possibleDebugger ? possibleDebugger->id() : QVariant()); |