From b2fb86f3afe896794efd0b7c8db5b0c6f4d1deb9 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 13 Oct 2022 14:20:34 +0200
Subject: [PATCH] RemoteLinux: Skip initial rsync step for remote build == run

Change-Id: I4d02b666fe10adf38513939255314682222cc82e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../remotelinux/remotelinuxdeployconfiguration.cpp       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 0bcdd6682b0..721107afebb 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -40,8 +40,13 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
     addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
     addInitialStep(Constants::KillAppStepId);
     addInitialStep(Constants::RsyncDeployStepId, [](Target *target) {
-        auto device = DeviceKitAspect::device(target->kit());
-        return device && device->extraData(Constants::SupportsRSync).toBool();
+        auto runDevice = DeviceKitAspect::device(target->kit());
+        auto buildDevice = BuildDeviceKitAspect::device(target->kit());
+        if (runDevice == buildDevice)
+            return false;
+        // FIXME: That's not the full truth, we need support from the build
+        // device, too.
+        return runDevice && runDevice->extraData(Constants::SupportsRSync).toBool();
     });
     addInitialStep(Constants::DirectUploadStepId, [](Target *target) {
         auto device = DeviceKitAspect::device(target->kit());