From: Olivier Goffart Date: Mon, 2 May 2016 15:34:21 +0000 (+0200) Subject: Propagator: fix qt4 build X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1172^2~32 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a67173610d5a1e7f65451177c6b76851078b38d8;p=nextcloud-desktop.git Propagator: fix qt4 build propagatedownload.cpp:712:35: error: 'seenLockedFile' is a protected member of 'OCC::OwncloudPropagator' Signals are protected in Qt4 but public in Qt5, mark the class accessing it as friend when compiling with Qt4 --- diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index db8a86b41..85fa42617 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -379,6 +379,11 @@ private: /** Stores the time since a job touched a file. */ QHash _touchedFiles; mutable QMutex _touchedFilesMutex; + +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + // access to signals which are protected in Qt4 + friend class PropagateDownloadFileQNAM; +#endif };