summaryrefslogtreecommitdiff
path: root/src/plugins/remotelinux
diff options
context:
space:
mode:
authorTobias Nätterlund <tobias.naetterlund.qnx@kdab.com>2014-02-10 09:49:55 +0100
committerTobias Nätterlund <tobias.naetterlund@kdab.com>2014-02-11 12:43:30 +0100
commitadb052be87efca17d989cc17516278e3af6f5dcb (patch)
treeb2df16fb95008d99d393a9c805ce0f37417096b8 /src/plugins/remotelinux
parent1ed9f6bbca1a8e7908b685f03f3100c6ebcaddb1 (diff)
downloadqt-creator-adb052be87efca17d989cc17516278e3af6f5dcb.tar.gz
RemoteLinux: Use AbstractRemoteLinuxDeployService without target
Made it possible to use AbstractRemoteLinuxDeployService without a target or a configured kit, by simply setting a device Change-Id: I9a11c6d9472dff30bc8512bcf333c1dd7ccfee76 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/plugins/remotelinux')
-rw-r--r--src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp5
-rw-r--r--src/plugins/remotelinux/abstractremotelinuxdeployservice.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
index 3887f6bbe5..7c2d906428 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
@@ -162,6 +162,11 @@ void AbstractRemoteLinuxDeployService::setTarget(Target *target)
d->deviceConfiguration = DeviceKitInformation::device(d->kit);
}
+void AbstractRemoteLinuxDeployService::setDevice(const IDevice::ConstPtr &device)
+{
+ d->deviceConfiguration = device;
+}
+
void AbstractRemoteLinuxDeployService::start()
{
QTC_ASSERT(d->state == Inactive, return);
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
index 94b7216fb4..84e0bb96c9 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
@@ -56,6 +56,8 @@ public:
~AbstractRemoteLinuxDeployService();
void setTarget(ProjectExplorer::Target *bc);
+ // Only use setDevice() as fallback if no target is available
+ void setDevice(const ProjectExplorer::IDevice::ConstPtr &device);
void start();
void stop();