Branch 'kolab/integration/4.13.0' - akonadi/tests

Aaron Seigo seigo at kolabsys.com
Mon Nov 17 18:14:12 CET 2014


 akonadi/tests/searchquerytest.cpp |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 0f33024500b7d446c234ee0740267d1455ae8099
Author: Aaron Seigo <aseigo at kde.org>
Date:   Mon Nov 17 18:12:46 2014 +0100

    build with QJson 0.7.1

diff --git a/akonadi/tests/searchquerytest.cpp b/akonadi/tests/searchquerytest.cpp
index b7d644f..45c8404 100644
--- a/akonadi/tests/searchquerytest.cpp
+++ b/akonadi/tests/searchquerytest.cpp
@@ -115,9 +115,14 @@ class SearchQueryTest : public QObject
         map[QLatin1String( "rel" )] = static_cast<int>( SearchTerm::RelAnd );
         map[QLatin1String( "subTerms" )] = subTerms;
 
+#if !defined( USE_QJSON_0_8 )
+        const QByteArray json = serializer.serialize( map );
+        QVERIFY( !json.isNull() );
+#else
         ok = false;
         const QByteArray json = serializer.serialize( map, &ok );
         QVERIFY( ok );
+#endif
 
         const SearchQuery query = SearchQuery::fromJSON( json );
         QVERIFY( !query.isNull() );




More information about the commits mailing list