feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Fix upload of directories

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2019-04-01 16:18:32 +02:00
parent 56ca042ddc
commit b8e5a609e1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/genericdirectuploadservice.cpp
View File

@@ -191,7 +191,7 @@ void GenericDirectUploadService::stopDeployment()
QList<DeployableFile> GenericDirectUploadService::collectFilesToUpload( QList<DeployableFile> GenericDirectUploadService::collectFilesToUpload(
const DeployableFile &deployable) const const DeployableFile &deployable) const
{ {
QList<DeployableFile> collected({deployable}); QList<DeployableFile> collected;
QFileInfo fileInfo = deployable.localFilePath().toFileInfo(); QFileInfo fileInfo = deployable.localFilePath().toFileInfo();
if (fileInfo.isDir()) { if (fileInfo.isDir()) {
const QStringList files = QDir(deployable.localFilePath().toString()) const QStringList files = QDir(deployable.localFilePath().toString())
@@ -203,6 +203,8 @@ QList<DeployableFile> GenericDirectUploadService::collectFilesToUpload(
+ fileInfo.fileName(); + fileInfo.fileName();
collected.append(collectFilesToUpload(DeployableFile(localFilePath, remoteDir))); collected.append(collectFilesToUpload(DeployableFile(localFilePath, remoteDir)));
} }
} else {
collected << deployable;
} }
return collected; return collected;
} }