From 0776f4277279ec2ccfdbbe34a4c66dfd974ba146 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Mon, 24 Mar 2025 09:50:21 +0100 Subject: [PATCH] fix Windows build `cl` didn't quite like it: ``` error C2445: result type of conditional expression is ambiguous: types 'QByteArray' and 'const char [1]' can be converted to multiple common types ``` just changing the `auto` to `QByteArray` results in the same compile error Signed-off-by: Jyrki Gadinger --- src/libsync/bulkpropagatorjob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/bulkpropagatorjob.cpp b/src/libsync/bulkpropagatorjob.cpp index 4cc5d6dad4..3b90c1d34d 100644 --- a/src/libsync/bulkpropagatorjob.cpp +++ b/src/libsync/bulkpropagatorjob.cpp @@ -295,7 +295,7 @@ void BulkPropagatorJob::slotComputeTransmissionChecksum(SyncFileItemPtr item, { // Compute the transmission checksum. const auto computeChecksum = new ComputeChecksum(this); - const auto checksumType = uploadChecksumEnabled() ? propagator()->account()->capabilities().preferredUploadChecksumType() : ""; + const auto checksumType = uploadChecksumEnabled() ? propagator()->account()->capabilities().preferredUploadChecksumType() : QByteArray{""}; computeChecksum->setChecksumType(checksumType); connect(computeChecksum, &ComputeChecksum::done, this, [this, item, fileToUpload] (const QByteArray &contentChecksumType, const QByteArray &contentChecksum) {