[Pkg-owncloud-commits] [owncloud-client] 198/498: Fix Qt4 build

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:50 UTC 2015


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 7332afa171f6a1aedce01d5efcc481357d9e8186
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Jun 25 14:36:22 2015 +0200

    Fix Qt4 build
    
    QTRY_VERIFY was private API in Qt4
---
 test/testtranschecksumvalidator.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/testtranschecksumvalidator.h b/test/testtranschecksumvalidator.h
index e97aa8f..e815c90 100644
--- a/test/testtranschecksumvalidator.h
+++ b/test/testtranschecksumvalidator.h
@@ -17,6 +17,11 @@
 #include "filesystem.h"
 #include "propagatorjobs.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+// poor man QTRY_VERIFY when Qt5 is not available.
+#define QTRY_VERIFY(Cond) QTest::qWait(1000); QVERIFY(Cond)
+#endif
+
 using namespace OCC;
 
     class TestTransChecksumValidator : public QObject

-- 
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