[Pkg-owncloud-commits] [owncloud-client] 436/470: Propagator: fix qt4 build

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit a67173610d5a1e7f65451177c6b76851078b38d8
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon May 2 17:34:21 2016 +0200

    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
---
 src/libsync/owncloudpropagator.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index db8a86b..85fa426 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<QString, QElapsedTimer> _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
 };
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git