Commit 7d46521e authored by hjk's avatar hjk

RunControl: Store a IDevice

Some information on where the thing is running is needed, IDevice
seemms to be the common denominator.

Change-Id: If6528e0deb118cedf5ccd06f6830b4afd3153473
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 2fd286cc
......@@ -542,9 +542,8 @@ public:
if (runConfiguration) {
displayName = runConfiguration->displayName();
outputFormatter = runConfiguration->createOutputFormatter();
if (runConfiguration->target())
project = runConfiguration->target()->project();
device = DeviceKitInformation::device(runConfiguration->target()->kit());
project = runConfiguration->target()->project();
}
// We need to ensure that there's always a OutputFormatter
......@@ -559,6 +558,7 @@ public:
QString displayName;
Runnable runnable;
IDevice::ConstPtr device;
Connection connection;
Core::Id runMode;
Utils::Icon icon;
......@@ -645,6 +645,11 @@ Abi RunControl::abi() const
return Abi();
}
IDevice::ConstPtr RunControl::device() const
{
return d->device;
}
RunConfiguration *RunControl::runConfiguration() const
{
return d->runConfiguration.data();
......
......@@ -29,6 +29,7 @@
#include "projectconfiguration.h"
#include "projectexplorerconstants.h"
#include "applicationlauncher.h"
#include "devicesupport/idevice.h"
#include <utils/qtcassert.h>
#include <utils/icon.h>
......@@ -369,6 +370,7 @@ public:
ProcessHandle applicationProcessHandle() const;
void setApplicationProcessHandle(const ProcessHandle &handle);
Abi abi() const;
IDevice::ConstPtr device() const;
RunConfiguration *runConfiguration() const;
Project *project() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment