summaryrefslogtreecommitdiff
path: root/src/plugins/qnx
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-16 13:49:32 +0200
committerhjk <hjk@qt.io>2018-05-22 08:24:46 +0000
commit68867a8a62c57cbea06ce1e270036605b9aee984 (patch)
tree0df8f54befd201418e9a93c23da674d1ecd5685e /src/plugins/qnx
parent8b4dbfb8e121de9f79823263abeb3d073593e042 (diff)
downloadqt-creator-68867a8a62c57cbea06ce1e270036605b9aee984.tar.gz
ProjectExplorer: Start merging Runnable and StandardRunnable
With AndroidRunnable gone, there is only one incarnation of a Runnable left - the StandardRunnable. It is not expected to ever need a different runnable again, as platform differences are now handled in the platform specific RunConfigurations and RunWorkers created there locally, and global information is typically communicated via RunConfigurationAspects, so there is no point in keeping the Runnable::{Concept,Model} machinery. This patch here essentially makes StandardRunnable a type alias for Runnable, to allow downstream changing all if (r.is<StandardRunnable>()) { ... r.as<StandardRunnable>(); } one by one. When all downstream is adjusted, the alias can go completely. Change-Id: I86aa92c7fae8d54ca603484b7e1746c126b0bddb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/qnx')
-rw-r--r--src/plugins/qnx/qnxdeviceprocess.cpp2
-rw-r--r--src/plugins/qnx/qnxdeviceprocess.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxdeviceprocess.cpp b/src/plugins/qnx/qnxdeviceprocess.cpp
index 086e556e5d..f96817946c 100644
--- a/src/plugins/qnx/qnxdeviceprocess.cpp
+++ b/src/plugins/qnx/qnxdeviceprocess.cpp
@@ -43,7 +43,7 @@ QnxDeviceProcess::QnxDeviceProcess(const QSharedPointer<const IDevice> &device,
m_pidFile = QString::fromLatin1("/var/run/qtc.%1.pid").arg(++pidFileCounter);
}
-QString QnxDeviceProcess::fullCommandLine(const StandardRunnable &runnable) const
+QString QnxDeviceProcess::fullCommandLine(const Runnable &runnable) const
{
QStringList args = QtcProcess::splitArgs(runnable.commandLineArguments);
args.prepend(runnable.executable);
diff --git a/src/plugins/qnx/qnxdeviceprocess.h b/src/plugins/qnx/qnxdeviceprocess.h
index 6fbb6ac8eb..d87146388e 100644
--- a/src/plugins/qnx/qnxdeviceprocess.h
+++ b/src/plugins/qnx/qnxdeviceprocess.h
@@ -40,7 +40,7 @@ public:
void interrupt() { doSignal(2); }
void terminate() { doSignal(15); }
void kill() { doSignal(9); }
- QString fullCommandLine(const ProjectExplorer::StandardRunnable &runnable) const;
+ QString fullCommandLine(const ProjectExplorer::Runnable &runnable) const;
private:
void doSignal(int sig);