summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/qnxdeviceprocess.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/qnxdeviceprocess.cpp
parentfdccc542754bc5361b8391ecd3902a88a84ab3cf (diff)
downloadqt-creator-36b835ff0ac1f6ab7b2ae8aab789352a9e297c21.tar.gz
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/qnxdeviceprocess.cpp')
-rw-r--r--src/plugins/qnx/qnxdeviceprocess.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxdeviceprocess.cpp b/src/plugins/qnx/qnxdeviceprocess.cpp
index f96817946c..5a2b5ecfd3 100644
--- a/src/plugins/qnx/qnxdeviceprocess.cpp
+++ b/src/plugins/qnx/qnxdeviceprocess.cpp
@@ -26,7 +26,7 @@
#include "qnxdeviceprocess.h"
#include <projectexplorer/devicesupport/sshdeviceprocess.h>
-#include <projectexplorer/runnables.h>
+
#include <utils/qtcprocess.h>
using namespace ProjectExplorer;
@@ -69,7 +69,7 @@ QString QnxDeviceProcess::fullCommandLine(const Runnable &runnable) const
void QnxDeviceProcess::doSignal(int sig)
{
auto signaler = new SshDeviceProcess(device(), this);
- StandardRunnable r;
+ Runnable r;
r.executable = QString::fromLatin1("kill -%2 `cat %1`").arg(m_pidFile).arg(sig);
connect(signaler, &SshDeviceProcess::finished, signaler, &QObject::deleteLater);
signaler->start(r);