forked from qt-creator/qt-creator
QtcProcess: Make processId() virtual
I guess this was an intention in the below commit.
Amends 9ec997b376
Change-Id: Ie55d18f764dc73601f6d911a22323fd2a39c4eb9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -76,7 +76,7 @@ public:
|
|||||||
virtual QByteArray readAllStandardError();
|
virtual QByteArray readAllStandardError();
|
||||||
virtual qint64 write(const QByteArray &input);
|
virtual qint64 write(const QByteArray &input);
|
||||||
|
|
||||||
qint64 processId() const;
|
virtual qint64 processId() const;
|
||||||
virtual QProcess::ProcessState state() const;
|
virtual QProcess::ProcessState state() const;
|
||||||
virtual int exitCode() const;
|
virtual int exitCode() const;
|
||||||
virtual QProcess::ExitStatus exitStatus() const;
|
virtual QProcess::ExitStatus exitStatus() const;
|
||||||
|
@@ -177,11 +177,6 @@ QByteArray SshDeviceProcess::readAllStandardError()
|
|||||||
return d->remoteProcess.get() ? d->remoteProcess->readAllStandardError() : QByteArray();
|
return d->remoteProcess.get() ? d->remoteProcess->readAllStandardError() : QByteArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
qint64 SshDeviceProcess::processId() const
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SshDeviceProcess::handleConnected()
|
void SshDeviceProcess::handleConnected()
|
||||||
{
|
{
|
||||||
QTC_ASSERT(d->state == SshDeviceProcessPrivate::Connecting, return);
|
QTC_ASSERT(d->state == SshDeviceProcessPrivate::Connecting, return);
|
||||||
|
@@ -63,7 +63,6 @@ private:
|
|||||||
void handleKillOperationTimeout();
|
void handleKillOperationTimeout();
|
||||||
|
|
||||||
virtual QString fullCommandLine() const;
|
virtual QString fullCommandLine() const;
|
||||||
virtual qint64 processId() const;
|
|
||||||
|
|
||||||
class SshDeviceProcessPrivate;
|
class SshDeviceProcessPrivate;
|
||||||
friend class SshDeviceProcessPrivate;
|
friend class SshDeviceProcessPrivate;
|
||||||
|
Reference in New Issue
Block a user