aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qnx/qnxdevice.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-16 15:42:03 +0200
committerhjk <hjk@qt.io>2018-05-23 08:48:36 +0000
commit36b835ff0ac1f6ab7b2ae8aab789352a9e297c21 (patch)
treeb3a63ee0ba58ca3bcfdb7631963f452c3658b8c3 /src/plugins/qnx/qnxdevice.cpp
parentfdccc542754bc5361b8391ecd3902a88a84ab3cf (diff)
Finish merging Runnable and StandardRunnable
As all Runnables are known to be StandardRunnables, this here essentially replaces all .is<StandardRunnable> by 'true'. .as<StandardRunnable> by no-op, and fixes the fallout. Change-Id: I1632f8e164fa0a9dff063df47a9e191fdf7bbb2e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qnx/qnxdevice.cpp')
-rw-r--r--src/plugins/qnx/qnxdevice.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index 01d6fec0f49..05a93c51798 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -31,7 +31,7 @@
#include "qnxdeviceprocess.h"
#include <projectexplorer/devicesupport/sshdeviceprocess.h>
-#include <projectexplorer/runnables.h>
+
#include <ssh/sshconnection.h>
#include <utils/port.h>
#include <utils/qtcassert.h>
@@ -59,7 +59,7 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod
Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const override
{
Q_UNUSED(protocol);
- StandardRunnable runnable;
+ Runnable runnable;
runnable.executable = "netstat";
runnable.commandLineArguments = "-na";
return runnable;
@@ -131,7 +131,7 @@ void QnxDevice::updateVersionNumber() const
QObject::connect(&versionNumberProcess, &SshDeviceProcess::finished, &eventLoop, &QEventLoop::quit);
QObject::connect(&versionNumberProcess, &DeviceProcess::error, &eventLoop, &QEventLoop::quit);
- StandardRunnable r;
+ Runnable r;
r.executable = QLatin1String("uname");
r.commandLineArguments = QLatin1String("-r");
versionNumberProcess.start(r);