From 7b90c8b0c533cdb8085420bf1e753518584df310 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 17 Aug 2011 16:02:00 +0200 Subject: [PATCH] RemoteLinux: Let application runners set the device configuration. Could conceivably make sense during doDeviceSetup(). Change-Id: I6a30d44561dbe75566e48c6db9604ff72075b8dd Reviewed-on: http://codereview.qt.nokia.com/3114 Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/remotelinuxapplicationrunner.cpp | 7 ++++++- src/plugins/remotelinux/remotelinuxapplicationrunner.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp b/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp index e9754b8d87..bb8e4350dc 100644 --- a/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp +++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp @@ -73,7 +73,7 @@ public: } RemoteLinuxUsedPortsGatherer portsGatherer; - const LinuxDeviceConfiguration::ConstPtr devConfig; + LinuxDeviceConfiguration::ConstPtr devConfig; const QString remoteExecutable; const QString appArguments; const QString commandPrefix; @@ -366,6 +366,11 @@ bool AbstractRemoteLinuxApplicationRunner::canRun(QString &whyNot) const return true; } +void AbstractRemoteLinuxApplicationRunner::setDeviceConfiguration(const LinuxDeviceConfiguration::ConstPtr &deviceConfig) +{ + m_d->devConfig = deviceConfig; +} + void AbstractRemoteLinuxApplicationRunner::handleDeviceSetupDone(bool success) { QTC_ASSERT(m_d->state == SettingUpDevice, return); diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.h b/src/plugins/remotelinux/remotelinuxapplicationrunner.h index 7683a4364a..9dc2732e94 100644 --- a/src/plugins/remotelinux/remotelinuxapplicationrunner.h +++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.h @@ -87,6 +87,8 @@ protected: // Override to to additional checks. virtual bool canRun(QString &whyNot) const; + void setDeviceConfiguration(const QSharedPointer &deviceConfig); + void handleDeviceSetupDone(bool success); void handleInitialCleanupDone(bool success); void handleInitializationsDone(bool success); -- 2.11.0