Android Kits: Use ANDROID_TARGET_ARCH in display name

Note this only affects newly generated kits.

Task-number: QTCREATORBUG-9865
Change-Id: I9f62c1d1932aa32e1a307b92ce0f8ba80bb6ed5c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-08-01 12:49:47 +02:00
parent b2a048b02f
commit 2654141511
3 changed files with 21 additions and 3 deletions

View File

@@ -33,6 +33,7 @@
#include "androiddevice.h"
#include "androidgdbserverkitinformation.h"
#include "ui_addnewavddialog.h"
#include "androidqtversion.h"
#include <coreplugin/icore.h>
#include <utils/hostosinfo.h>
@@ -776,10 +777,9 @@ void AndroidConfigurations::updateAutomaticKitList()
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);
AndroidQtVersion *qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitInformation::qtVersion(kit));
kit->setDisplayName(tr("Android for %1 (GCC %2, Qt %3)")
.arg(arch)
.arg(qt->targetArch())
.arg(tc->ndkToolChainVersion())
.arg(qt->qtVersionString()));
KitManager::instance()->registerKit(kit);