[Pkg-owncloud-commits] [owncloud-client] 17/333: Propagator: Fix compilation
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:28 UTC 2014
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 8c9a65635f1dc10a8c1fba48d4cf39afb184adda
Author: Markus Goetz <markus at woboq.com>
Date: Mon Feb 10 15:46:09 2014 +0100
Propagator: Fix compilation
It is still protected on Qt4
---
src/mirall/owncloudpropagator.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 699ebe6..72de68a 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -354,7 +354,11 @@ void PropagateUploadFile::start()
if( state == HBF_SOURCE_FILE_CHANGE ) {
if( attempts++ < 5 ) { /* FIXME: How often do we want to try? */
qDebug("SOURCE file has changed during upload, retry #%d in %d seconds!", attempts, 2*attempts);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QThread::sleep(2*attempts);
+#else
+ sleep(2*attempts);
+#endif
if( _previousFileSize == 0 ) {
_previousFileSize = _item._size;
} else {
@@ -402,7 +406,11 @@ void PropagateUploadFile::start()
if( attempts++ < 5 ) { /* FIXME: How often do we want to try? */
qDebug("SOURCE file has changed after upload, retry #%d in %d seconds!", attempts, 2*attempts);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QThread::sleep(2*attempts);
+#else
+ sleep(2*attempts);
+#endif
continue;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list