From 189dbc585ea8edba0e87c06dc58240dfbcaba97c Mon Sep 17 00:00:00 2001 From: hjk <hjk@qt.io> Date: Wed, 20 Sep 2017 16:07:08 +0200 Subject: [PATCH] Debugger: Fix misplaced { Harm was limited, as these were the fallback values for terminal and working directory that are overridden in all cases with real RunConfiguations. Change-Id: I7d3cef1ac814a0ffcf60a8977e0ae13136ea50b5 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> --- src/plugins/debugger/debuggerruncontrol.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 6946d8395d3..160840da3b2 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -760,8 +760,8 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl) QString(), QString(), optionalPrompt); }); - Runnable r = runnable(); { - if (r.is<StandardRunnable>()) + Runnable r = runnable(); + if (r.is<StandardRunnable>()) { m_runParameters.inferior = r.as<StandardRunnable>(); m_runParameters.useTerminal = m_runParameters.inferior.runMode == ApplicationLauncher::Console; // Normalize to work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch'...) -- GitLab