Commit d67bf484 authored by Tobias Hunger's avatar Tobias Hunger

Fix debugger auto-detection

Do not change the debugger when autodetecting it if the current
one is ok already.

Task-number: QTCREATORBUG-8954
Change-Id: I258da68abb121f5ce9a7618269adf783ab8de487
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent e088541c
......@@ -158,6 +158,9 @@ unsigned int DebuggerKitInformation::priority() const
DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(const Kit *k)
{
if (DebuggerKitInformation::isValidDebugger(k))
return DebuggerKitInformation::debuggerItem(k);
DebuggerItem result;
const ToolChain *tc = ToolChainKitInformation::toolChain(k);
Abi abi = Abi::hostAbi();
......@@ -203,8 +206,7 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons
void DebuggerKitInformation::setup(Kit *k)
{
QTC_ASSERT(ToolChainManager::instance()->isLoaded(), return);
if (!isValidDebugger(k))
setDebuggerItem(k, autoDetectItem(k));
setDebuggerItem(k, autoDetectItem(k));
}
// Check the configuration errors and return a flag mask. Provide a quick check and
......
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