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

Debugger: Prefer debuggers in PATH to others when setting up kits

Browse Source 
Task-number: QTCREATORBUG-18188
Change-Id: Iaee65491cca5d7a66b6fbb70c2500395a995790d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2017-05-12 14:54:22 +02:00
parent dfa7e492a1
commit 4c472e790b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -59,14 +59,20 @@ DebuggerKitInformation::DebuggerKitInformation()
QVariant DebuggerKitInformation::defaultValue(const Kit *k) const QVariant DebuggerKitInformation::defaultValue(const Kit *k) const
{ {
const Abi toolChainAbi = ToolChainKitInformation::targetAbi(k); const Abi toolChainAbi = ToolChainKitInformation::targetAbi(k);
const QStringList paths = Environment::systemEnvironment().path();
QVariant nextBestFit;
foreach (const DebuggerItem &item, DebuggerItemManager::debuggers()) { foreach (const DebuggerItem &item, DebuggerItemManager::debuggers()) {
foreach (const Abi targetAbi, item.abis()) { foreach (const Abi targetAbi, item.abis()) {
if (targetAbi.isCompatibleWith(toolChainAbi)) if (targetAbi.isCompatibleWith(toolChainAbi)) {
return item.id(); if (paths.contains(item.command().toFileInfo().absolutePath()))
return item.id(); // prefer debuggers found in PATH over those found elsewhere
if (nextBestFit.isNull())
nextBestFit = item.id();
}
} }
} }
return QVariant(); return nextBestFit;
} }
void DebuggerKitInformation::setup(Kit *k) void DebuggerKitInformation::setup(Kit *k)