aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2012-04-24 15:49:09 +0200
committerTobias Hunger <[email protected]>2012-06-21 12:08:12 +0200
commit24314562165588b56a318b3b8a846bf5deda7c41 (patch)
treeb5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
parent8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff)
Profile introduction
Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxenvironmentreader.cpp')
-rw-r--r--src/plugins/remotelinux/remotelinuxenvironmentreader.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 5b51621fcaf..97fdd7c1d63 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -34,6 +34,8 @@
#include "remotelinuxrunconfiguration.h"
#include <ssh/sshremoteprocessrunner.h>
+#include <projectexplorer/profileinformation.h>
+#include <projectexplorer/target.h>
namespace RemoteLinux {
namespace Internal {
@@ -42,11 +44,11 @@ RemoteLinuxEnvironmentReader::RemoteLinuxEnvironmentReader(RemoteLinuxRunConfigu
QObject *parent)
: QObject(parent)
, m_stop(false)
- , m_devConfig(config->deviceConfig())
+ , m_devConfig(ProjectExplorer::DeviceProfileInformation::device(config->target()->profile()))
, m_runConfig(config)
, m_remoteProcessRunner(0)
{
- connect(config, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)),
+ connect(config->target(), SIGNAL(profileChanged()),
this, SLOT(handleCurrentDeviceConfigChanged()));
}
@@ -87,7 +89,7 @@ void RemoteLinuxEnvironmentReader::handleConnectionFailure()
void RemoteLinuxEnvironmentReader::handleCurrentDeviceConfigChanged()
{
- m_devConfig = m_runConfig->deviceConfig();
+ m_devConfig = ProjectExplorer::DeviceProfileInformation::device(m_runConfig->target()->profile());
if (m_remoteProcessRunner)
disconnect(m_remoteProcessRunner, 0, this, 0);