Commit 6cecb7e4 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/3.6' into 4.0

Change-Id: Id86f31f52ed1d3f28745b2324b8af32283a24ded
parents 40e902c7 0fda5b63
......@@ -523,6 +523,10 @@ FileName AndroidConfig::gccPath(const Abi &abi, const QString &ndkToolChainVersi
FileName AndroidConfig::gdbPath(const Abi &abi, const QString &ndkToolChainVersion) const
const auto gdbPath = QString::fromLatin1("%1/prebuilt/%2/bin/gdb" QTC_HOST_EXE_SUFFIX).arg(m_ndkLocation.toString()).arg(toolchainHost());
if (QFile::exists(gdbPath))
return FileName::fromString(gdbPath);
return toolPath(abi, ndkToolChainVersion).appendString(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment