Merge branch 'stable'

This commit is contained in:
Aleix Pol 2015-09-11 17:03:57 +02:00
commit b62349cae6

View file

@ -83,7 +83,10 @@ void FileTransferJob::startTransfer()
mDeviceName), mDeviceName),
QPair<QString, QString>(i18nc("File transfer destination", "To"), mDestination.toLocalFile())); QPair<QString, QString>(i18nc("File transfer destination", "To"), mDestination.toLocalFile()));
mReply = Daemon::instance()->networkAccessManager()->put(QNetworkRequest(mDestination), mOrigin.data()); QNetworkRequest req(mDestination);
req.setHeader(QNetworkRequest::ContentLengthHeader, totalAmount(Bytes));
mReply = Daemon::instance()->networkAccessManager()->put(req, mOrigin.data());
connect(mReply, &QNetworkReply::uploadProgress, this, [this](qint64 bytesSent, qint64 /*bytesTotal*/) { connect(mReply, &QNetworkReply::uploadProgress, this, [this](qint64 bytesSent, qint64 /*bytesTotal*/) {
setProcessedAmount(Bytes, bytesSent); setProcessedAmount(Bytes, bytesSent);
emitSpeed(bytesSent/mTime.elapsed()); emitSpeed(bytesSent/mTime.elapsed());