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

Android: Delete auto generated kits without valid Qt version

Browse Source 
Task-number: QTCREATORBUG-18229
Change-Id: I55a31a12b00eefe70c224c2d9e4939218827e1be
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Vikas Pachdha
2017-05-19 09:57:51 +02:00
parent e2a45d0032
commit 00167e5ab2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/android/androidconfigurations.cpp
View File

@@ -1001,9 +1001,16 @@ void AndroidConfigurations::removeOldToolChains()
void AndroidConfigurations::updateAutomaticKitList() void AndroidConfigurations::updateAutomaticKitList()
{ {
const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](const Kit *k) { const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) {
return k->isAutoDetected() && !k->isSdkProvided() Core::Id deviceTypeId = DeviceTypeKitInformation::deviceTypeId(k);
&& DeviceTypeKitInformation::deviceTypeId(k) == Core::Id(Constants::ANDROID_DEVICE_TYPE); 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 // Update code for 3.0 beta, which shipped with a bug for the debugger settings