From cdc88b2571a4062d5753cd07924e30a3accb3894 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 22 Dec 2022 13:30:03 +0100 Subject: [PATCH] RemoteLinux: Handle already remote local files This is a bit hackish to support "true" remote builds. Conceptually, that's more similar to a "local" (a.k.a. "Desktop" configurations when it comes to (non-)deployment, but the Desktop runconfigs are currently a bit too tied to the host system, and we'd like to have the X11 forwarding that's already available here. Change-Id: I750b2cfe6b94ec8f60a0e879f3fe44ddaf86072e Reviewed-by: Christian Kandeler Reviewed-by: Qt CI Bot Reviewed-by: --- src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 18ad4794062..3e28f24af49 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -62,7 +62,10 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Id id) const FilePath localExecutable = bti.targetFilePath; DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable); - exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath())); + if (depFile.localFilePath().needsDevice()) // a full remote build + exeAspect->setExecutable(depFile.localFilePath()); + else + exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath())); symbolsAspect->setFilePath(localExecutable); const IDeviceConstPtr buildDevice = BuildDeviceKitAspect::device(target->kit());