From 28b0e9d3eaa98255656c4b7a76e65059692a7eaf Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 27 Feb 2013 13:08:54 +0100 Subject: [PATCH] Android: Set the display name for automatic kits just before registering The KitManager tries to make the name unique, thus we should wait with the setDisplayName until we deregistered the old kits. Change-Id: I299bff72665768febc8a3310790dd2511b1794ed Reviewed-by: Tobias Hunger --- src/plugins/android/androidconfigurations.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 149d8835305..64ba7280259 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -620,11 +620,6 @@ void AndroidConfigurations::updateAutomaticKitList() foreach (QtSupport::BaseQtVersion *qt, qtVersions) { Kit *newKit = new Kit; newKit->setAutoDetected(true); - QString arch = ProjectExplorer::Abi::toString(tc->targetAbi().architecture()); - newKit->setDisplayName(tr("Android for %1 (GCC %2, Qt %3)") - .arg(arch) - .arg(tc->ndkToolChainVersion()) - .arg(qt->qtVersionString())); newKit->setIconPath(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON)); DeviceTypeKitInformation::setDeviceTypeId(newKit, Core::Id(Constants::ANDROID_DEVICE_TYPE)); ToolChainKitInformation::setToolChain(newKit, tc); @@ -656,8 +651,16 @@ void AndroidConfigurations::updateAutomaticKitList() foreach (Kit *k, existingKits) KitManager::instance()->deregisterKit(k); - foreach (Kit *kit, newKits) + foreach (Kit *kit, newKits) { + AndroidToolChain *tc = static_cast(ToolChainKitInformation::toolChain(kit)); + QString arch = ProjectExplorer::Abi::toString(tc->targetAbi().architecture()); + QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(kit); + kit->setDisplayName(tr("Android for %1 (GCC %2, Qt %3)") + .arg(arch) + .arg(tc->ndkToolChainVersion()) + .arg(qt->qtVersionString())); KitManager::instance()->registerKit(kit); + } } /**