diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-07-02 14:47:43 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-07-08 08:28:14 +0000 |
| commit | 3f655815be222bdbdac54c4790c587822b03b943 (patch) | |
| tree | 513a39c395c9563402cf4d45891be56f73c7ae3b | |
| parent | 41c697a67ba756b901b995b007283cf910149b44 (diff) | |
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 <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 8 |
1 files 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<const AndroidQtVersion *>(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()); |