[neon/qt/qtbase/Neon/release] debian: Refresh fix_recursion_crash.diff.

[Lisandro Damián Nicanor Pérez Meyer]

Git commit 432d24a92b6c48f598346f8f6e815f66f3b172c1 by Lisandro Damián Nicanor Pérez Meyer.
Committed on 22/09/2021 at 18:05.
Pushed by jriddell into branch 'Neon/release'.

Refresh fix_recursion_crash.diff.

M  +1    -0    debian/changelog
M  +8    -7    debian/patches/fix_recursion_crash.diff

https://invent.kde.org/neon/qt/qtbase/commit/432d24a92b6c48f598346f8f6e815f66f3b172c1

diff --git a/debian/changelog b/debian/changelog
index c49d1e9..b663bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtbase-opensource-src (5.15.2+dfsg-11) UNRELEASED; urgency=medium
     xcb_add_a_timeout_control_when_reading_INCR_property.patch in order to fix
     timestamp issue on QXcbConnection,
     https://bugreports.qt.io/browse/QTBUG-56595
+  * Refresh fix_recursion_crash.diff.
 
  -- Debian Janitor <janitor at jelmer.uk>  Fri, 27 Aug 2021 23:06:45 -0000
 
diff --git a/debian/patches/fix_recursion_crash.diff b/debian/patches/fix_recursion_crash.diff
index d9cdd04..01c28e4 100644
--- a/debian/patches/fix_recursion_crash.diff
+++ b/debian/patches/fix_recursion_crash.diff
@@ -13,11 +13,14 @@ Change-Id: I79c51192a939b0b62e5b1d0dcc90d38f79e28222
 Reviewed-by: Jarek Kobus <jaroslaw.kobus at qt.io>
 ---
 
-diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
-index b02e401..226c1ec 100644
+---
+ src/widgets/styles/qstylesheetstyle.cpp                             |    3 +
+ tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp |   18 ++++++++++
+ 2 files changed, 21 insertions(+)
+
 --- a/src/widgets/styles/qstylesheetstyle.cpp
 +++ b/src/widgets/styles/qstylesheetstyle.cpp
-@@ -2670,6 +2670,9 @@
+@@ -2626,6 +2626,9 @@ void QStyleSheetStyle::setProperties(QWi
          default: v = decl.d->values.at(0).variant; break;
          }
  
@@ -27,11 +30,9 @@ index b02e401..226c1ec 100644
          w->setProperty(propertyL1, v);
      }
  }
-diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
-index 6c4c7d5..2750017 100644
 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
 +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
-@@ -92,6 +92,7 @@
+@@ -94,6 +94,7 @@ private slots:
      void layoutSpacing();
  #endif
      void qproperty();
@@ -39,7 +40,7 @@ index 6c4c7d5..2750017 100644
      void palettePropagation_data();
      void palettePropagation();
      void fontPropagation_data();
-@@ -672,6 +673,23 @@
+@@ -677,6 +678,23 @@ void tst_QStyleSheetStyle::qproperty()
      QCOMPARE(pb.isChecked(), false);
  }