From 898eb4a460dcba8f708287409e9d27bcf2f957c0 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 5 Sep 2017 15:30:12 +0200 Subject: [PATCH] Debugger: Move .useTerminal modification to central fixup Even if this is LLDB-specific having the value fixed early will help in moving terminal handling into a RunWorker of its own. Change-Id: I73a9564148dec9b28557c12cc248a4f0b668f8d7 Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggerruncontrol.cpp | 7 +++++++ src/plugins/debugger/lldb/lldbengine.cpp | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index fb43e60eeaf..b60f8b296fc 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -708,6 +708,13 @@ static bool fixupParameters(DebuggerRunParameters &rp, RunControl *runControl, Q } } + // FIXME: We can't handle terminals yet. + if (rp.useTerminal && rp.cppEngineType == LldbEngineType) { + qWarning("Run in Terminal is not supported yet with the LLDB backend"); + m_errors.append(DebuggerPlugin::tr("Run in Terminal is not supported with the LLDB backend.")); + rp.useTerminal = false; + } + return true; } diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 433440f5f47..9aedd4c3a1b 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -176,13 +176,6 @@ void LldbEngine::abortDebugger() void LldbEngine::setupEngine() { - // FIXME: We can't handle terminals yet. - if (runParameters().useTerminal) { - qWarning("Run in Terminal is not supported yet with the LLDB backend"); - showMessage(tr("Run in Terminal is not supported with the LLDB backend."), AppError); - runParameters().useTerminal = false; - } - if (runParameters().useTerminal) { QTC_CHECK(false); // See above. if (HostOsInfo::isWindowsHost()) {