feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Fix opening terminals on remote devices

Browse Source 
When the active project is on a remote device the working directory
is set to its root directory. In this case we need to find the right shell
binary from the remote device.

Change-Id: I6b541273d23a8de5442ac041b28d81984ed5ef65
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2024-02-08 17:45:34 +01:00
parent 5328674479
commit e073c54d01
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/terminal/terminalpane.cpp
View File

@@ -106,6 +106,17 @@ void TerminalPane::openTerminal(const OpenTerminalParameters &parameters)
} }
} }
if (parametersCopy.workingDirectory->needsDevice() && !parametersCopy.shellCommand) {
const FilePath shell = parametersCopy.workingDirectory->withNewPath(
parametersCopy.environment
.value_or(parametersCopy.workingDirectory->deviceEnvironment())
.value_or("SHELL", "/bin/sh"));
if (!shell.isExecutableFile())
parametersCopy.workingDirectory.reset();
else
parametersCopy.shellCommand = CommandLine{shell, {}};
}
const auto terminalWidget = new TerminalWidget(&m_tabWidget, parametersCopy); const auto terminalWidget = new TerminalWidget(&m_tabWidget, parametersCopy);
using namespace Constants; using namespace Constants;