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

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

Browse Source 
Change-Id: Id86f31f52ed1d3f28745b2324b8af32283a24ded
This commit is contained in:
Eike Ziller
2016-03-16 14:11:48 +01:00
parent 40e902c744 0fda5b6354
commit 6cecb7e4db
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,6 +523,10 @@ FileName AndroidConfig::gccPath(const Abi &abi, const QString &ndkToolChainVersi
FileName AndroidConfig::gdbPath(const Abi &abi, const QString &ndkToolChainVersion) const 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)); return toolPath(abi, ndkToolChainVersion).appendString(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
} }