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

Use QtcProcess in SshConnection::connectionInfo()

Browse Source 
Change-Id: Ibc0966ee43266d5d0f5f4f71274f11a4150eab3b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2021-11-04 18:35:47 +01:00
parent 19205e10af
commit a5318cba79
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/ssh/sshconnection.cpp
View File

@@ -36,6 +36,7 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <QByteArrayList> #include <QByteArrayList>
#include <QDir> #include <QDir>
@@ -273,9 +274,10 @@ SshConnectionInfo SshConnection::connectionInfo() const
QTC_ASSERT(state() == Connected, return SshConnectionInfo()); QTC_ASSERT(state() == Connected, return SshConnectionInfo());
if (d->connInfo.isValid()) if (d->connInfo.isValid())
return d->connInfo; return d->connInfo;
QProcess p; QtcProcess p;
p.start(SshSettings::sshFilePath().toString(), d->connectionArgs(SshSettings::sshFilePath()) const FilePath sshFilePath = SshSettings::sshFilePath();
<< "echo" << "-n" << "$SSH_CLIENT"); p.setCommand({sshFilePath, d->connectionArgs(sshFilePath) << "echo" << "-n" << "$SSH_CLIENT"});
p.start();
if (!p.waitForStarted() || !p.waitForFinished()) { if (!p.waitForStarted() || !p.waitForFinished()) {
qCWarning(Internal::sshLog) << "failed to retrieve connection info:" << p.errorString(); qCWarning(Internal::sshLog) << "failed to retrieve connection info:" << p.errorString();
return SshConnectionInfo(); return SshConnectionInfo();