forked from qt-creator/qt-creator
QtcProcess: Get rid of useTerminal
Remove SshRemoteProcessRunner::runInTerminal() method,
it wasn't used anywhere (just in test).
Remove QtcProcess::useTerminal, as process should be
created in TerminalOn mode when there is a need for terminal.
Add a parameter to
SshRemoteProcess::fullLocalCommandLine(bool inTerminal)
as this may still be needed when running application
through ssh from terminal (ssh -tt option).
Change-Id: I71911082fcca190b82a1106a2ca1ca48dc5d4c79
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 95a9b22f6f)
This commit is contained in:
@@ -192,7 +192,6 @@ void SshDeviceProcess::handleConnected()
|
||||
if (!display.isEmpty())
|
||||
d->process->requestX11Forwarding(display);
|
||||
if (runInTerminal()) {
|
||||
d->process->setUseTerminal(true);
|
||||
connect(&d->consoleProcess, &QtcProcess::errorOccurred,
|
||||
this, &DeviceProcess::errorOccurred);
|
||||
connect(&d->consoleProcess, &QtcProcess::started,
|
||||
@@ -200,7 +199,7 @@ void SshDeviceProcess::handleConnected()
|
||||
connect(&d->consoleProcess, &QtcProcess::finished,
|
||||
this, [this] { handleProcessFinished(d->consoleProcess.errorString()); });
|
||||
d->consoleProcess.setAbortOnMetaChars(false);
|
||||
d->consoleProcess.setCommand(d->process->fullLocalCommandLine());
|
||||
d->consoleProcess.setCommand(d->process->fullLocalCommandLine(true));
|
||||
d->consoleProcess.start();
|
||||
} else {
|
||||
connect(d->process.get(), &QSsh::SshRemoteProcess::started,
|
||||
|
||||
Reference in New Issue
Block a user