From 8e8442408ce5593605a04c4a0616d2504b638093 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Mon, 17 May 2021 16:42:21 +0200 Subject: Fix merge --- src/gui/socketapi/socketuploadjob.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/socketapi') diff --git a/src/gui/socketapi/socketuploadjob.cpp b/src/gui/socketapi/socketuploadjob.cpp index 4b6f96a56..3c087b028 100644 --- a/src/gui/socketapi/socketuploadjob.cpp +++ b/src/gui/socketapi/socketuploadjob.cpp @@ -169,8 +169,8 @@ void SocketUploadJob::start() auto propfindJob = new PropfindJob(engine->account(), remotePath, this); propfindJob->setProperties({ QByteArrayLiteral("http://owncloud.org/ns:fileid") }); - connect(propfindJob, &PropfindJob::result, this, [engine, this](const QVariantMap &data) { - _backupFileId = data[QStringLiteral("fileid")].toByteArray(); + connect(propfindJob, &PropfindJob::result, this, [engine, this](const QMap &data) { + _backupFileId = data[QStringLiteral("fileid")].toUtf8(); engine->startSync(); }); connect(propfindJob, &PropfindJob::finishedWithError, this, [this] { -- cgit v1.2.3