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

Android: Set the display name for automatic kits just before registering

Browse Source 
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 <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-02-27 13:08:54 +01:00
parent 7ed4f6ec48
commit 28b0e9d3ea
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<AndroidToolChain *>(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);
}
}
/**