From 00167e5ab2f73275fac29f915f7535ace9efe593 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Fri, 19 May 2017 09:57:51 +0200 Subject: [PATCH] Android: Delete auto generated kits without valid Qt version Task-number: QTCREATORBUG-18229 Change-Id: I55a31a12b00eefe70c224c2d9e4939218827e1be Reviewed-by: Tobias Hunger --- src/plugins/android/androidconfigurations.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 5e2c8eb3954..0aa9b46740b 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1001,9 +1001,16 @@ void AndroidConfigurations::removeOldToolChains() void AndroidConfigurations::updateAutomaticKitList() { - const QList existingKits = Utils::filtered(KitManager::kits(), [](const Kit *k) { - return k->isAutoDetected() && !k->isSdkProvided() - && DeviceTypeKitInformation::deviceTypeId(k) == Core::Id(Constants::ANDROID_DEVICE_TYPE); + const QList existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) { + Core::Id deviceTypeId = DeviceTypeKitInformation::deviceTypeId(k); + if (k->isAutoDetected() && !k->isSdkProvided() + && deviceTypeId == Core::Id(Constants::ANDROID_DEVICE_TYPE)) { + if (!QtSupport::QtKitInformation::qtVersion(k)) + KitManager::deregisterKit(k); // Remove autoDetected kits without Qt. + else + return true; + } + return false; }); // Update code for 3.0 beta, which shipped with a bug for the debugger settings