[Pkg-owncloud-commits] [owncloud-client] 316/333: Build with BOTH Qt4 and 5

[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 1d70426bb7c9e1abc5b1296f745ad7a23f83700b
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Apr 7 17:25:25 2014 +0200

    Build with BOTH Qt4 and 5
---
 src/mirall/syncengine.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 84fa4f4..8f9af37 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -605,8 +605,16 @@ void SyncEngine::setNetworkLimits()
     }
     _propagator->_uploadLimit = uploadLimit;
 
-    int propDownloadLimit = _propagator->_downloadLimit.load();
-    int propUploadLimit = _propagator->_uploadLimit.load();
+    int propDownloadLimit = _propagator->_downloadLimit
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+            .load()
+#endif
+            ;
+    int propUploadLimit = _propagator->_uploadLimit
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+            .load()
+#endif
+            ;
 
     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