diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 8f42a2225a5..82e04e7b796 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -33,6 +33,7 @@ #include "androiddevice.h" #include "androidgdbserverkitinformation.h" #include "ui_addnewavddialog.h" +#include "androidqtversion.h" #include #include @@ -776,10 +777,9 @@ void AndroidConfigurations::updateAutomaticKitList() 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); + AndroidQtVersion *qt = static_cast(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); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index b4e82b6cd2a..15814ada0e3 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -46,6 +46,8 @@ #include #include +#include + 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(); diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index a29235d8c03..6ac95f00d5e 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -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