diff --git a/src/plugins/qnx/qnxruncontrol.cpp b/src/plugins/qnx/qnxruncontrol.cpp index 1aef6ca9595cdf0e284d4fd99ff3522fe80e4a6d..0f717d83bebfba4c30cbac1326dd250a036b9c6d 100644 --- a/src/plugins/qnx/qnxruncontrol.cpp +++ b/src/plugins/qnx/qnxruncontrol.cpp @@ -30,16 +30,38 @@ ****************************************************************************/ #include "qnxruncontrol.h" +#include "qnxdeviceconfiguration.h" #include "qnxrunconfiguration.h" +#include "slog2inforunner.h" +#include <projectexplorer/kitinformation.h> #include <projectexplorer/runconfiguration.h> -#include <remotelinux/remotelinuxrunconfiguration.h> +#include <projectexplorer/target.h> + +#include <QFileInfo> using namespace Qnx; using namespace Qnx::Internal; using namespace RemoteLinux; QnxRunControl::QnxRunControl(ProjectExplorer::RunConfiguration *runConfig) - : RemoteLinuxRunControl(runConfig) + : RemoteLinuxRunControl(runConfig) + , m_slog2Info(0) +{ + ProjectExplorer::IDevice::ConstPtr dev = ProjectExplorer::DeviceKitInformation::device(runConfig->target()->kit()); + QnxDeviceConfiguration::ConstPtr qnxDevice = dev.dynamicCast<const QnxDeviceConfiguration>(); + + QnxRunConfiguration *qnxRunConfig = qobject_cast<QnxRunConfiguration *>(runConfig); + QTC_CHECK(qnxRunConfig); + + const QString applicationId = QFileInfo(qnxRunConfig->remoteExecutableFilePath()).fileName(); + m_slog2Info = new Slog2InfoRunner(applicationId, qnxDevice, this); + connect(m_slog2Info, SIGNAL(output(QString,Utils::OutputFormat)), this, SLOT(appendMessage(QString,Utils::OutputFormat))); + connect(this, SIGNAL(started()), m_slog2Info, SLOT(start())); +} + +ProjectExplorer::RunControl::StopResult QnxRunControl::stop() { + m_slog2Info->stop(); + return RemoteLinuxRunControl::stop(); } diff --git a/src/plugins/qnx/qnxruncontrol.h b/src/plugins/qnx/qnxruncontrol.h index c064d15328123eeef1a49e67b0b675270a4f6247..20368e608917d5a9ccd494cf29ade4b96493dc83 100644 --- a/src/plugins/qnx/qnxruncontrol.h +++ b/src/plugins/qnx/qnxruncontrol.h @@ -37,11 +37,18 @@ namespace Qnx { namespace Internal { +class Slog2InfoRunner; + class QnxRunControl : public RemoteLinux::RemoteLinuxRunControl { Q_OBJECT public: explicit QnxRunControl(ProjectExplorer::RunConfiguration *runConfig); + + RemoteLinux::RemoteLinuxRunControl::StopResult stop(); + +private: + Slog2InfoRunner *m_slog2Info; }; } // namespace Internal diff --git a/src/plugins/qnx/slog2inforunner.h b/src/plugins/qnx/slog2inforunner.h index 52455e2466093f6e3eceef8a5df0b684dd46153a..9728f3aa7b6591bfe1a507a4f29d46552e454125 100644 --- a/src/plugins/qnx/slog2inforunner.h +++ b/src/plugins/qnx/slog2inforunner.h @@ -52,11 +52,13 @@ class Slog2InfoRunner : public QObject public: explicit Slog2InfoRunner(const QString &applicationId, const RemoteLinux::LinuxDevice::ConstPtr &device, QObject *parent = 0); - void start(); void stop(); bool commandFound() const; +public slots: + void start(); + signals: void commandMissing(); void started();