From 67607e4bc60ada2926825dd34ac18856c9f4a841 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 26 Oct 2021 10:26:17 +0200 Subject: [PATCH] Debugger: adjust inferior paths for remote debugger Change-Id: I251c7a69b6595848c737c2547d22d8e0a4f2076a Reviewed-by: hjk --- src/plugins/debugger/debuggerruncontrol.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index daa8749e021..80e9cecba7c 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -912,9 +912,14 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm } } - m_runParameters.inferior = runnable(); + Runnable inferior = runnable(); + const FilePath &debuggerExecutable = m_runParameters.debugger.command.executable(); + inferior.command.setExecutable(inferior.command.executable().onDevice(debuggerExecutable)); + inferior.workingDirectory = inferior.workingDirectory.onDevice(debuggerExecutable); // Normalize to work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch'...) - m_runParameters.inferior.workingDirectory = m_runParameters.inferior.workingDirectory.normalizedPathName(); + inferior.workingDirectory = inferior.workingDirectory.normalizedPathName(); + m_runParameters.inferior = inferior; + setUseTerminal(allowTerminal == DoAllowTerminal && m_runParameters.useTerminal); const QByteArray envBinary = qgetenv("QTC_DEBUGGER_PATH");