Merge remote-tracking branch '2.1' into 2.2

diff --cc CMakeLists.txt
Simple merge

diff --cc src/libsync/propagatedownload.cpp
index 17b2421db5b439c72ff7154ab73a252e16c59108,f3cce6bc037bdc6fe5d005856aa598a7a9a77243..306788388beda00d697641c7673059303a20c01a
--- 1/src/libsync/propagatedownload.cpp
--- 2/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@@ -642,22 -642,11 +642,21 @@@ static void handleRecallFile(const QStr
          FileSystem::uncheckedRenameReplace(fpath, rpath, &error);
      }
  }
 +
 +static void preserveGroupOwnership(const QString& fileName, const QFileInfo& fi)
 +{
 +#ifdef Q_OS_UNIX
 +    chown(fileName.toLocal8Bit().constData(), -1, fi.groupId());
 +#else
 +    Q_UNUSED(fileName);
 +    Q_UNUSED(fi);
 +#endif
 +}
  } // end namespace
  
- 
  void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
  {
 -    const auto theContentChecksumType = QByteArray("SHA1");
 +    const auto theContentChecksumType = contentChecksumType();
  
      // Reuse transmission checksum as content checksum.
      //

diff --cc src/libsync/syncengine.cpp
Simple merge

diff --cc src/libsync/syncjournaldb.cpp
Simple merge