From 0e6aed8127a86082f410e8a7e625a60b1005476d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 18 Feb 2022 01:56:48 +0100 Subject: [PATCH] QtcProcess: Make processId() virtual I guess this was an intention in the below commit. Amends 9ec997b37654894b027cf4bbd98ca8bba47171b5 Change-Id: Ie55d18f764dc73601f6d911a22323fd2a39c4eb9 Reviewed-by: Qt CI Bot Reviewed-by: hjk --- src/libs/utils/qtcprocess.h | 2 +- .../projectexplorer/devicesupport/sshdeviceprocess.cpp | 5 ----- src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index f04535936b4..081e43e6e32 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -76,7 +76,7 @@ public: virtual QByteArray readAllStandardError(); virtual qint64 write(const QByteArray &input); - qint64 processId() const; + virtual qint64 processId() const; virtual QProcess::ProcessState state() const; virtual int exitCode() const; virtual QProcess::ExitStatus exitStatus() const; diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp index efd48b278d4..b1c52752722 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp @@ -177,11 +177,6 @@ QByteArray SshDeviceProcess::readAllStandardError() return d->remoteProcess.get() ? d->remoteProcess->readAllStandardError() : QByteArray(); } -qint64 SshDeviceProcess::processId() const -{ - return 0; -} - void SshDeviceProcess::handleConnected() { QTC_ASSERT(d->state == SshDeviceProcessPrivate::Connecting, return); diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h index 9cd3368fd6b..633bf0e3f1b 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h @@ -63,7 +63,6 @@ private: void handleKillOperationTimeout(); virtual QString fullCommandLine() const; - virtual qint64 processId() const; class SshDeviceProcessPrivate; friend class SshDeviceProcessPrivate;