forked from qt-creator/qt-creator
Get rid of SshProcess (one process class less)
Introduce static SshRemoteProcess::setupSshEnvironment() method instead. Change-Id: I9a49bc68bd96ddf0f58234d28b92a721f7d4bb56 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -28,7 +28,6 @@
|
||||
#include "sftpsession.h"
|
||||
#include "sftptransfer.h"
|
||||
#include "sshlogging_p.h"
|
||||
#include "sshprocess.h"
|
||||
#include "sshremoteprocess.h"
|
||||
#include "sshsettings.h"
|
||||
|
||||
@@ -129,7 +128,10 @@ bool operator!=(const SshConnectionParameters &p1, const SshConnectionParameters
|
||||
struct SshConnection::SshConnectionPrivate
|
||||
{
|
||||
SshConnectionPrivate(const SshConnectionParameters &sshParameters)
|
||||
: connParams(sshParameters) {}
|
||||
: connParams(sshParameters)
|
||||
{
|
||||
SshRemoteProcess::setupSshEnvironment(&masterProcess);
|
||||
}
|
||||
|
||||
QString fullProcessError()
|
||||
{
|
||||
@@ -166,7 +168,7 @@ struct SshConnection::SshConnectionPrivate
|
||||
|
||||
const SshConnectionParameters connParams;
|
||||
SshConnectionInfo connInfo;
|
||||
SshProcess masterProcess;
|
||||
QtcProcess masterProcess;
|
||||
QString errorString;
|
||||
std::unique_ptr<QTemporaryDir> masterSocketDir;
|
||||
State state = Unconnected;
|
||||
|
||||
Reference in New Issue
Block a user