From b8e5a609e10f5ddf55d6d2d71238b1e46f5302c0 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 1 Apr 2019 16:18:32 +0200
Subject: [PATCH] RemoteLinux: Fix upload of directories

When "expanding" directories, we must remove the directory itself from
the list of deployables. This was broken in f4a12d488c.

Fixes: QTCREATORBUG-22210
Change-Id: I0946aa83cb34aaca01520f19e2aaf3414ae2db17
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/remotelinux/genericdirectuploadservice.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp
index 100cf040201..e07c819275c 100644
--- a/src/plugins/remotelinux/genericdirectuploadservice.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp
@@ -191,7 +191,7 @@ void GenericDirectUploadService::stopDeployment()
 QList<DeployableFile> GenericDirectUploadService::collectFilesToUpload(
         const DeployableFile &deployable) const
 {
-    QList<DeployableFile> collected({deployable});
+    QList<DeployableFile> collected;
     QFileInfo fileInfo = deployable.localFilePath().toFileInfo();
     if (fileInfo.isDir()) {
         const QStringList files = QDir(deployable.localFilePath().toString())
@@ -203,6 +203,8 @@ QList<DeployableFile> GenericDirectUploadService::collectFilesToUpload(
                 + fileInfo.fileName();
             collected.append(collectFilesToUpload(DeployableFile(localFilePath, remoteDir)));
         }
+    } else {
+        collected << deployable;
     }
     return collected;
 }