From beec36c7d379f005ed3005ae4f7f0e5e46006d5d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 9 Nov 2016 14:48:08 +0100 Subject: [PATCH] Debugger: Allow debuggerruncontrol creation with warnings Change-Id: I50092cb99c24ab31fafb1b5ce3c0b371adc42f38 Reviewed-by: hjk --- src/plugins/debugger/debuggerkitinformation.cpp | 2 +- src/plugins/debugger/debuggerruncontrol.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index da20b9170ca..6aaaa4074cb 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -294,7 +294,7 @@ QList DebuggerKitInformation::validateDebugger(const Kit *k) if (errors & DebuggerDoesNotMatch) { const QString message = tr("The ABI of the selected debugger does not " "match the toolchain ABI."); - result << Task(Task::Error, message, FileName(), -1, id); + result << Task(Task::Warning, message, FileName(), -1, id); } return result; } diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 47dc345feb3..c31cbff9943 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -474,9 +474,13 @@ static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration * if (rp.languages & CppLanguage) { const QList tasks = DebuggerKitInformation::validateDebugger(kit); if (!tasks.isEmpty()) { - foreach (const Task &t, tasks) + foreach (const Task &t, tasks) { + if (t.type == Task::Warning) + continue; errors->append(t.description); - return 0; + } + if (!errors->isEmpty()) + return 0; } }