feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RunControl: Store a IDevice

Browse Source 
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:
hjk
2016-02-01 12:37:35 +01:00
parent 2fd286cc93
commit 7d46521e3a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -542,9 +542,8 @@ public:
if (runConfiguration) { if (runConfiguration) {
displayName = runConfiguration->displayName(); displayName = runConfiguration->displayName();
outputFormatter = runConfiguration->createOutputFormatter(); outputFormatter = runConfiguration->createOutputFormatter();
device = DeviceKitInformation::device(runConfiguration->target()->kit());
if (runConfiguration->target()) project = runConfiguration->target()->project();
project = runConfiguration->target()->project();
} }
// We need to ensure that there's always a OutputFormatter // We need to ensure that there's always a OutputFormatter
@@ -559,6 +558,7 @@ public:
QString displayName; QString displayName;
Runnable runnable; Runnable runnable;
IDevice::ConstPtr device;
Connection connection; Connection connection;
Core::Id runMode; Core::Id runMode;
Utils::Icon icon; Utils::Icon icon;
@@ -645,6 +645,11 @@ Abi RunControl::abi() const
return Abi(); return Abi();
} }
IDevice::ConstPtr RunControl::device() const
{
return d->device;
}
RunConfiguration *RunControl::runConfiguration() const RunConfiguration *RunControl::runConfiguration() const
{ {
return d->runConfiguration.data(); return d->runConfiguration.data();

2
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -29,6 +29,7 @@
#include "projectconfiguration.h" #include "projectconfiguration.h"
#include "projectexplorerconstants.h" #include "projectexplorerconstants.h"
#include "applicationlauncher.h" #include "applicationlauncher.h"
#include "devicesupport/idevice.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/icon.h> #include <utils/icon.h>
@@ -369,6 +370,7 @@ public:
ProcessHandle applicationProcessHandle() const; ProcessHandle applicationProcessHandle() const;
void setApplicationProcessHandle(const ProcessHandle &handle); void setApplicationProcessHandle(const ProcessHandle &handle);
Abi abi() const; Abi abi() const;
IDevice::ConstPtr device() const;
RunConfiguration *runConfiguration() const; RunConfiguration *runConfiguration() const;
Project *project() const; Project *project() const;