From 3f655815be222bdbdac54c4790c587822b03b943 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 2 Jul 2020 14:47:43 +0300 Subject: [PATCH] Android: keep manual Qt version names in the autodected kit name With in 19154bf0e75a52f8611843fd49729b79115b7bc7, When having an offial Qt for Android and a manual Qt for Android with the name version, the kit will have the same name, avoid that by keeping the exact name of the manual versions. Change-Id: I280a286f99cbc17185a5309c8825381e03ea7ff6 Reviewed-by: Alessandro Portale --- src/plugins/android/androidconfigurations.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 4154e2ad924..cbad6ea04a2 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1422,8 +1422,12 @@ void AndroidConfigurations::updateAutomaticKitList() QStringList abis = static_cast(qt)->androidAbis(); Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis, QtKitAspect::qtVersion(k))); k->makeSticky(); - k->setUnexpandedDisplayName(tr("Android Qt %1 Clang %2") - .arg(qt->qtVersionString()) + + QString versionStr = QLatin1String("Qt %{Qt:Version}"); + if (!qt->isAutodetected()) + versionStr = QLatin1String("%1").arg(qt->displayName()); + k->setUnexpandedDisplayName(tr("Android %1 Clang %2") + .arg(versionStr) .arg(containsAllAbis(abis) ? "Multi-Abi" : abis.join(","))); k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString()); k->setValueSilently(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString());