[SCM] Grantlee template engine packaging branch, master, updated. debian/5.0.0-3-8-g050779d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/grantlee.git;a=commitdiff;h=eb4610a

The following commit has been merged in the master branch:
commit eb4610a27bb5920f8a9fc07db1cb8ad4bafbf04b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jun 30 10:25:07 2016 +0200

    Refresh patch variantIsTrue-float-fix.diff, update coding style to match the current upstream code
    
    Gbp-Dch: Ignore
---
 debian/patches/variantIsTrue-float-fix.diff | 40 +++++++++++++++++------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/debian/patches/variantIsTrue-float-fix.diff b/debian/patches/variantIsTrue-float-fix.diff
index 6f68768..01e0aae 100644
--- a/debian/patches/variantIsTrue-float-fix.diff
+++ b/debian/patches/variantIsTrue-float-fix.diff
@@ -6,28 +6,34 @@ Description: Fix variantIsTrue for float variants
 Last-Update: 2013-12-08
 Forwarded: https://www.gitorious.org/grantlee/grantlee/merge_requests/10
 
-Index: grantlee/templates/tests/testdefaulttags.cpp
-===================================================================
---- grantlee.orig/templates/tests/testdefaulttags.cpp	2015-05-28 11:27:27.693597227 +0200
-+++ grantlee/templates/tests/testdefaulttags.cpp	2015-05-28 11:27:27.665598350 +0200
-@@ -610,6 +610,20 @@
-   dict.insert( QStringLiteral( "var" ), r );
-   QTest::newRow( "if-truthiness10" ) << QString::fromLatin1( "{% if var %}Yes{% else %}No{% endif %}" ) << dict << QString::fromLatin1( "Yes" ) << NoError;
+--- a/templates/tests/testdefaulttags.cpp
++++ b/templates/tests/testdefaulttags.cpp
+@@ -1064,6 +1064,28 @@
+       << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}") << dict
+       << QStringLiteral("Yes") << NoError;
  
 +  double d = 0.0;
-+  dict.insert( QLatin1String( "var" ), d );
-+  QTest::newRow( "if-truthiness11" ) << QString::fromLatin1( "{% if var %}Yes{% else %}No{% endif %}" ) << dict << QString::fromLatin1( "No" ) << NoError;
++  dict.insert(QStringLiteral( "var" ), d);
++  QTest::newRow("if-truthiness11")
++    << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}")
++    << dict << QStringLiteral("No") << NoError;
 +  d = 7.1;
-+  dict.insert( QLatin1String( "var" ), d );
-+  QTest::newRow( "if-truthiness12" ) << QString::fromLatin1( "{% if var %}Yes{% else %}No{% endif %}" ) << dict << QString::fromLatin1( "Yes" ) << NoError;
++  dict.insert(QStringLiteral("var"), d);
++  QTest::newRow("if-truthiness12")
++    << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}")
++    << dict << QStringLiteral("Yes") << NoError;
 +
 +  float f = 0.0;
-+  dict.insert( QLatin1String( "var" ), f );
-+  QTest::newRow( "if-truthiness13" ) << QString::fromLatin1( "{% if var %}Yes{% else %}No{% endif %}" ) << dict << QString::fromLatin1( "No" ) << NoError;
++  dict.insert(QStringLiteral("var"), f);
++  QTest::newRow("if-truthiness13")
++    << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}")
++    << dict << QStringLiteral("No") << NoError;
 +  f = 7.1;
-+  dict.insert( QLatin1String( "var" ), f );
-+  QTest::newRow( "if-truthiness14" ) << QString::fromLatin1( "{% if var %}Yes{% else %}No{% endif %}" ) << dict << QString::fromLatin1( "Yes" ) << NoError;
++  dict.insert(QStringLiteral("var"), f);
++  QTest::newRow("if-truthiness14")
++    << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}")
++    << dict << QStringLiteral("Yes") << NoError;
 +
    dict.clear();
-   QTest::newRow( "if-tag-badarg01" ) << QString::fromLatin1( "{% if x|default_if_none:y %}yes{% endif %}" ) << dict << QString() << NoError;
- 
+   QTest::newRow("if-tag-badarg01")
+       << QStringLiteral("{% if x|default_if_none:y %}yes{% endif %}") << dict

-- 
Grantlee template engine packaging