forked from qt-creator/qt-creator
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: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user