Commit dd1e5107 authored by hjk's avatar hjk
Browse files

Android: Fix debugger autodetection



Task-number: QTCREATORBUG-10341
Change-Id: I197ae5745d5caba12bce3e148ada2a589ac7f9b3
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 2559f986
......@@ -798,7 +798,15 @@ void AndroidConfigurations::updateAutomaticKitList()
ToolChainKitInformation::setToolChain(newKit, tc);
QtSupport::QtKitInformation::setQtVersion(newKit, qt);
DeviceKitInformation::setDevice(newKit, device);
Debugger::DebuggerKitInformation::setDebugger(newKit, tc->suggestedDebugger());
Debugger::DebuggerItem debugger;
debugger.setCommand(tc->suggestedDebugger());
debugger.setEngineType(Debugger::GdbEngineType);
debugger.setDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi());
Debugger::DebuggerKitInformation::setDebugger(newKit, debugger);
AndroidGdbServerKitInformation::setGdbSever(newKit, tc->suggestedGdbServer());
newKit->makeSticky();
newKits << newKit;
......
......@@ -254,14 +254,6 @@ void DebuggerKitInformation::setDebugger(Kit *k, const DebuggerItem &item)
k->setValue(DebuggerKitInformation::id(), id);
}
void DebuggerKitInformation::setDebugger(Kit *k, const FileName &command)
{
DebuggerItem item;
item.setEngineType(GdbEngineType);
item.setCommand(command);
setDebugger(k, item);
}
Core::Id DebuggerKitInformation::id()
{
return "Debugger.Information";
......
......@@ -107,7 +107,6 @@ public:
ItemList toUserOutput(const ProjectExplorer::Kit *k) const;
static void setDebugger(ProjectExplorer::Kit *k, const DebuggerItem &item);
static void setDebugger(ProjectExplorer::Kit *k, const Utils::FileName &command);
static Core::Id id();
static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k);
......
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