feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: shorten the kit and debugger names

Browse Source 
The multi-abi kit names are too long since they contain the full list of
ABIs, this might cause build issues at least on windows host.

Task-number: QTBUG-83875
Change-Id: I137fa9a177eb2143be1421129b9dbd12515a3da9
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-02 09:32:27 +03:00
parent 1d3d2b5311
commit 19154bf0e7
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androidconfigurations.cpp
View File

@@ -1258,6 +1258,16 @@ void AndroidConfigurations::removeUnusedDebuggers()
} }
} }
static bool containsAllAbis(const QStringList &abis)
{
QStringList supportedAbis{"armeabi-v7a", "arm64-v8a", "x86", "x86_64"};
for (const QString &abi : abis)
if (supportedAbis.contains(abi))
supportedAbis.removeOne(abi);
return supportedAbis.isEmpty();
}
static QVariant findOrRegisterDebugger(ToolChain *tc, static QVariant findOrRegisterDebugger(ToolChain *tc,
const QStringList &abisList, const QStringList &abisList,
const BaseQtVersion *qtVersion) const BaseQtVersion *qtVersion)
@@ -1289,8 +1299,8 @@ static QVariant findOrRegisterDebugger(ToolChain *tc,
debugger.setEngineType(Debugger::GdbEngineType); debugger.setEngineType(Debugger::GdbEngineType);
debugger.setUnexpandedDisplayName( debugger.setUnexpandedDisplayName(
AndroidConfigurations::tr("Android Debugger (%1, NDK %2)") AndroidConfigurations::tr("Android Debugger (%1, NDK %2)")
.arg(abisList.join(", "), .arg(containsAllAbis(abisList) ? "Multi-Abi" : abisList.join(","))
AndroidConfigurations::currentConfig().ndkVersion(qtVersion).toString())); .arg(AndroidConfigurations::currentConfig().ndkVersion(qtVersion).toString()));
debugger.setAutoDetected(true); debugger.setAutoDetected(true);
debugger.setAbis(abis.toVector()); debugger.setAbis(abis.toVector());
debugger.reinitializeFromFile(); debugger.reinitializeFromFile();
@@ -1390,9 +1400,9 @@ void AndroidConfigurations::updateAutomaticKitList()
QStringList abis = static_cast<const AndroidQtVersion *>(qt)->androidAbis(); QStringList abis = static_cast<const AndroidQtVersion *>(qt)->androidAbis();
Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis, QtKitAspect::qtVersion(k))); Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis, QtKitAspect::qtVersion(k)));
k->makeSticky(); k->makeSticky();
k->setUnexpandedDisplayName(tr("Android for %1 (Clang %2)") k->setUnexpandedDisplayName(tr("Android Qt %1 Clang %2")
.arg(abis.join(",")) .arg(qt->qtVersionString())
.arg(qt->displayName())); .arg(containsAllAbis(abis) ? "Multi-Abi" : abis.join(",")));
k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString()); k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString());
k->setValueSilently(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString()); k->setValueSilently(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString());
}; };