Merge remote-tracking branch 'origin/4.14'

Change-Id: Id4c4c06b086dfe38960f4d68694ae23f3e00109f
2020-12-03 11:57:42 +01:00
parent b281d6f00a f946e5b356
commit 1e78fdb71f
63 changed files with 642 additions and 219 deletions
--- a/src/libs/ssh/sftptransfer.cpp
+++ b/src/libs/ssh/sftptransfer.cpp
@@ -180,9 +180,8 @@ void SftpTransfer::doStart()
                         + QtcProcess::quoteArgUnix(sourceFileOrLinkTarget).toLocal8Bit() + ' '
                         + QtcProcess::quoteArgUnix(f.targetFile).toLocal8Bit() + '\n');
    }
-    d->sftpProc.start(sftpBinary.toString(),
-                      QStringList{"-b", QDir::toNativeSeparators(batchFile.fileName())}
-                          << d->connectionArgs);
+    d->sftpProc.setStandardInputFile(batchFile.fileName());
+    d->sftpProc.start(sftpBinary.toString(), d->connectionArgs);
    emit started();
 }