Remove ToolChain::suggestedDebugger()

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

Change-Id: I87f135b5d115adb7e46b0f009c5853221e9a3daa
Reviewed-by: hjk <hjk@qt.io>

src/plugins/android/androidconfigurations.cpp

@@ -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()));

src/plugins/android/androidtoolchain.cpp

@@ -105,12 +105,6 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
             AndroidConfigurations::currentConfig().sdkLocation().toString());
 }
 
-FilePath AndroidToolChain::suggestedDebugger() const
-{
-    // TODO: Make use of LLDB if available.
-    return AndroidConfigurations::currentConfig().gdbPath(targetAbi());
-}
-
 FilePath AndroidToolChain::suggestedGdbServer() const
 {
     return AndroidConfigurations::currentConfig().gdbServer(targetAbi());

src/plugins/android/androidtoolchain.h

@@ -42,7 +42,6 @@ public:
     bool isValid() const override;
     void addToEnvironment(Utils::Environment &env) const override;
 
-    Utils::FilePath suggestedDebugger() const override;
     Utils::FilePath suggestedGdbServer() const;
     QStringList suggestedMkspecList() const override;
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;