From b385bf8eb5168ffd3bb95034336d13f9cd38e6e4 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 2 Dec 2020 15:25:57 +0100
Subject: [PATCH] RemoteLinux: Classify executables correctly

... in the MakeInstallStep.
See also d56e88d36a.

Fixes: QTCREATORBUG-25022
Change-Id: I0824355e0604cd4a7cc2ac9cdb4a55733cb0f706
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/remotelinux/makeinstallstep.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 91a2d5e8d89..d919d885a20 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -42,6 +42,7 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QFormLayout>
+#include <QSet>
 #include <QTemporaryDir>
 
 using namespace ProjectExplorer;
@@ -182,11 +183,16 @@ void MakeInstallStep::finish(bool success)
         m_deploymentData.setLocalInstallRoot(installRoot());
         QDirIterator dit(installRoot().toString(), QDir::Files | QDir::Hidden,
                          QDirIterator::Subdirectories);
+        const auto appFileNames = transform<QSet<QString>>(buildSystem()->applicationTargets(),
+            [](const BuildTargetInfo &appTarget) { return appTarget.targetFilePath.fileName(); });
         while (dit.hasNext()) {
             dit.next();
             const QFileInfo fi = dit.fileInfo();
+            const DeployableFile::Type type = appFileNames.contains(fi.fileName())
+                ? DeployableFile::TypeExecutable
+                : DeployableFile::TypeNormal;
             m_deploymentData.addFile(fi.filePath(),
-                                     fi.dir().path().mid(installRoot().toString().length()));
+                                     fi.dir().path().mid(installRoot().toString().length()), type);
         }
         buildSystem()->setDeploymentData(m_deploymentData);
     } else if (m_noInstallTarget && m_isCmakeProject) {