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

Remove ToolChain::suggestedDebugger()

Browse Source 
And inline it in AndroidConfigurations, which is the only place that
made use of suggestedDebugger()

Change-Id: I87f135b5d115adb7e46b0f009c5853221e9a3daa
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2019-06-11 19:06:27 +02:00
parent b43a222ae2
commit a38c3ac08e
8 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,7 +948,7 @@ void AndroidConfigurations::removeOldToolChains()
static QVariant findOrRegisterDebugger(ToolChain *tc)
{
const FilePath command = tc->suggestedDebugger();
const FilePath command = AndroidConfigurations::currentConfig().gdbPath(tc->targetAbi());
// check if the debugger is already registered, but ignoring the display name
const Debugger::DebuggerItem *existing = Debugger::DebuggerItemManager::findByCommand(command);
if (existing && existing->engineType() == Debugger::GdbEngineType && existing->isAutoDetected()
@@ -956,7 +956,7 @@ static QVariant findOrRegisterDebugger(ToolChain *tc)
return existing->id();
// debugger not found, register a new one
Debugger::DebuggerItem debugger;
debugger.setCommand(tc->suggestedDebugger());
debugger.setCommand(command);
debugger.setEngineType(Debugger::GdbEngineType);
debugger.setUnexpandedDisplayName(
AndroidConfigurations::tr("Android Debugger for %1").arg(tc->displayName()));