From d6a84fe22c90b5cdb9ce2ebdd88b48d6d6c04ff1 Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Wed, 15 Feb 2017 10:00:52 +0100 Subject: [PATCH] Use full Qt name for generated Android kits Instead of "Android for armabi-v7a (GCC 4.9, Qt 5.7.1)" this gives "Android for armabi-v7a (GCC 4.9, Qt 5.7.1 (android_armv7-project)" which isn't exactly nice for the double parenthesis, but necessary to maintain basic sanity with project specific Qt builds. Change-Id: I2d41334a7f1ff28dc056d5967abe2b4b8697b63d Reviewed-by: BogDan Vatra --- src/plugins/android/androidconfigurations.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 626eae2e8b6..c7121307be9 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1327,10 +1327,10 @@ void AndroidConfigurations::updateAutomaticKitList() AndroidGdbServerKitInformation::setGdbSever(newKit, tc->suggestedGdbServer()); newKit->makeSticky(); - newKit->setUnexpandedDisplayName(tr("Android for %1 (GCC %2, Qt %3)") + newKit->setUnexpandedDisplayName(tr("Android for %1 (GCC %2, %3)") .arg(static_cast(qt)->targetArch()) .arg(tc->ndkToolChainVersion()) - .arg(qt->qtVersionString())); + .arg(qt->displayName())); if (!existingKit) KitManager::registerKit(newKit); }