Merge remote-tracking branch 'origin/4.9'

Change-Id: I7d1912cd5c4d824fd40d3454c5f1bb796f2c21d8

1 files changed, 3 insertions, 1 deletions

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;
 }