[Pkg-owncloud-commits] [owncloud-client] 315/333: Build fix: QAtomicInt has no implicit integer conversion in Qt5

[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 6a2fe6be67562c1186b1ebe9909ec1689f5afbec
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Apr 7 16:48:14 2014 +0200

    Build fix: QAtomicInt has no implicit integer conversion in Qt5
---
 src/mirall/syncengine.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index bf892ef..84fa4f4 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -605,8 +605,11 @@ void SyncEngine::setNetworkLimits()
     }
     _propagator->_uploadLimit = uploadLimit;
 
-    if( _propagator->_downloadLimit + _propagator->_uploadLimit > 0 ) {
-        qDebug() << " N------N Network Limits (down/up) " << _propagator->_downloadLimit << _propagator->_uploadLimit;
+    int propDownloadLimit = _propagator->_downloadLimit.load();
+    int propUploadLimit = _propagator->_uploadLimit.load();
+
+    if( propDownloadLimit + propUploadLimit > 0 ) {
+        qDebug() << " N------N Network Limits (down/up) " << propDownloadLimit << propUploadLimit;
     }
 }
 

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