forked from qt-creator/qt-creator
Debugger: adjust inferior paths for remote debugger
Change-Id: I251c7a69b6595848c737c2547d22d8e0a4f2076a Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -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");
|
||||
|
Reference in New Issue
Block a user