Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2021-05-17 17:42:21 +0300
committerHannah von Reth <hannah.vonreth@owncloud.com>2021-05-17 17:42:39 +0300
commit8e8442408ce5593605a04c4a0616d2504b638093 (patch)
treecc01dd6e43670f253be158ce12956c9c44d377f3 /src/gui/socketapi
parent434433f199dd653b302f46b4665ca77c98032488 (diff)
Fix merge
Diffstat (limited to 'src/gui/socketapi')
-rw-r--r--src/gui/socketapi/socketuploadjob.cpp4
1 files changed, 2 insertions, 2 deletions
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<QString, QString> &data) {
+ _backupFileId = data[QStringLiteral("fileid")].toUtf8();
engine->startSync();
});
connect(propfindJob, &PropfindJob::finishedWithError, this, [this] {