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

Utils: Combine startStubProcess parameters

Browse Source 
Change-Id: Ic0515a3864687494bd1e280a82b91a5bafef46b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-05-04 09:54:24 +02:00
parent ca1e0dae56
commit 6aa02fe804
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/terminalhooks.cpp
View File

@@ -42,8 +42,7 @@ class ExternalTerminalProcessImpl final : public TerminalInterface
~ProcessStubCreator() override = default;
expected_str<qint64> startStubProcess(const CommandLine &cmd,
const ProcessSetupData &setupData) override
expected_str<qint64> startStubProcess(const ProcessSetupData &setupData) override
{
const TerminalCommand terminal = TerminalCommand::terminalEmulator();
@@ -56,8 +55,8 @@ class ExternalTerminalProcessImpl final : public TerminalInterface
f.write(QString("cd %1\n").arg(setupData.m_workingDirectory.nativePath()).toUtf8());
f.write("clear\n");
f.write(QString("exec '%1' %2\n")
.arg(cmd.executable().nativePath())
.arg(cmd.arguments())
.arg(setupData.m_commandLine.executable().nativePath())
.arg(setupData.m_commandLine.arguments())
.toUtf8());
f.close();
@@ -94,7 +93,7 @@ class ExternalTerminalProcessImpl final : public TerminalInterface
process->setWorkingDirectory(setupData.m_workingDirectory);
if constexpr (HostOsInfo::isWindowsHost()) {
process->setCommand(cmd);
process->setCommand(setupData.m_commandLine);
process->setCreateConsoleOnWindows(true);
process->setProcessMode(ProcessMode::Writer);
} else {
@@ -102,7 +101,7 @@ class ExternalTerminalProcessImpl final : public TerminalInterface
CommandLine cmdLine = {terminal.command, {}};
if (!extraArgsFromOptions.isEmpty())
cmdLine.addArgs(extraArgsFromOptions, CommandLine::Raw);
cmdLine.addCommandLineAsArgs(cmd, CommandLine::Raw);
cmdLine.addCommandLineAsArgs(setupData.m_commandLine, CommandLine::Raw);
process->setCommand(cmdLine);
}