forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user