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

Merge remote-tracking branch 'origin/4.13'

Browse Source 
Change-Id: I015bac0cccdf466a923c706abdedd8bd8800b0cd
This commit is contained in:
Eike Ziller
2020-07-06 10:30:54 +02:00
parent a2bf75bb55 00bb6ea958
commit 1de74cceab
225 changed files with 4591 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidtoolchain.cpp
View File

@@ -209,8 +209,6 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
const AndroidConfig config = AndroidConfigurations::currentConfig();
for (const Utils::FilePath &ndkLocation : ndkLocations) {
qCDebug(androidTCLog) << "Detecting toolchains from Android NDK:" << ndkLocation;
FilePath clangPath = config.clangPathFromNdk(ndkLocation);
if (!clangPath.exists()) {
qCDebug(androidTCLog) << "Clang toolchains detection fails. Can not find Clang"
@@ -241,12 +239,12 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
AndroidConfig::displayName(abi),
config.ndkVersion(ndkLocation).toString()));
if (tc) {
qCDebug(androidTCLog) << "Tool chain already known" << abi.toString() << lang;
// make sure to update the toolchain with current name format
if (tc->displayName() != displayName)
tc->setDisplayName(displayName);
} else {
qCDebug(androidTCLog) << "New Clang toolchain found" << abi.toString() << lang;
qCDebug(androidTCLog) << "New Clang toolchain found" << abi.toString() << lang
<< "for NDK" << ndkLocation;
auto atc = new AndroidToolChain();
atc->setNdkLocation(ndkLocation);
atc->setOriginalTargetTriple(target);