Commit 26541415 authored by Daniel Teske's avatar Daniel Teske

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: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
parent b2a048b0
......@@ -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);
......
......@@ -46,6 +46,8 @@
#include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorer.h>
#include <proparser/profileevaluator.h>
using namespace Android::Internal;
using namespace ProjectExplorer;
using namespace Qt4ProjectManager;
......@@ -130,6 +132,17 @@ QString AndroidQtVersion::description() const
return tr("Android");
}
QString AndroidQtVersion::targetArch() const
{
ensureMkSpecParsed();
return m_targetArch;
}
void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
{
m_targetArch = evaluator->value(QLatin1String("ANDROID_TARGET_ARCH"));
}
Core::FeatureSet AndroidQtVersion::availableFeatures() const
{
Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
......
......@@ -59,6 +59,11 @@ public:
QString platformDisplayName() const;
QString description() const;
QString targetArch() const;
protected:
virtual void parseMkSpec(ProFileEvaluator *) const;
private:
mutable QString m_targetArch;
};
} // namespace Internal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment