[neon/qt/qtbase/Neon/release] debian: Remove incorrect patch.

[Lisandro Damián Nicanor Pérez Meyer]

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

Remove incorrect patch.

The patch includes QByteArrayView which is a Qt 6 oly class.

M  +0    -4    debian/changelog
D  +0    -66   debian/patches/fix_recursion_crash.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/2f52a550d6e98a8a82ed8866e88d9c419e570a71

diff --git a/debian/changelog b/debian/changelog
index 06e42be..a0cdcf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,6 @@ qtbase-opensource-src (5.15.2+dfsg-11) UNRELEASED; urgency=medium
   * Apply multi-arch hints.
     + qtbase5-doc, qtbase5-doc-dev, qtbase5-doc-html: Add Multi-Arch: foreign.
 
-  [ Lu Yaning ]
-  * Backport upstream patch to fix recursion crash when calling
-    setStyleSheet with `qproperty-styleSheet`: fix_recursion_crash.diff.
-
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Backport upstream patch
     xcb_add_a_timeout_control_when_reading_INCR_property.diff in order to fix
diff --git a/debian/patches/fix_recursion_crash.diff b/debian/patches/fix_recursion_crash.diff
deleted file mode 100644
index 01c28e4..0000000
--- a/debian/patches/fix_recursion_crash.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-From e9cdcc7cb314586aec76b8b9979435f0af963443 Mon Sep 17 00:00:00 2001
-From: Zhang Yu <zhangyub at uniontech.com>
-Date: Tue, 15 Jun 2021 21:05:41 +0800
-Subject: [PATCH] Fix recursion crash when calling setStyleSheet with `qproperty-styleSheet`
-
-When calling `setStyleSheet` with property `qproperty-styleSheet`,
-`QStyleSheetStyle::polish` will call`QStyleSheetStyle::setProperties`, and then`QStyleSheetStyle::setProperties` goes on to call `setProperty`.Because there is property `qproperty-styleSheet`, it will update stylesheet by calling QStyleSheetStyle::polish`.
-This causes the recursive call to crash.
-
-Fixes: QTBUG-94448
-Pick-to: 5.15 6.2
-Change-Id: I79c51192a939b0b62e5b1d0dcc90d38f79e28222
-Reviewed-by: Jarek Kobus <jaroslaw.kobus at qt.io>
----
-
----
- 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
-@@ -2626,6 +2626,9 @@ void QStyleSheetStyle::setProperties(QWi
-         default: v = decl.d->values.at(0).variant; break;
-         }
- 
-+        if (propertyL1 == QByteArrayView("styleSheet") && value == v)
-+            continue;
-+
-         w->setProperty(propertyL1, v);
-     }
- }
---- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
-+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
-@@ -94,6 +94,7 @@ private slots:
-     void layoutSpacing();
- #endif
-     void qproperty();
-+    void qproperty_styleSheet();
-     void palettePropagation_data();
-     void palettePropagation();
-     void fontPropagation_data();
-@@ -677,6 +678,23 @@ void tst_QStyleSheetStyle::qproperty()
-     QCOMPARE(pb.isChecked(), false);
- }
- 
-+void tst_QStyleSheetStyle::qproperty_styleSheet()
-+{
-+    QWidget w;
-+    auto checkBox = new QCheckBox("check", &w);
-+    QString sheet = R"(QCheckBox { qproperty-styleSheet: "QCheckBox { qproperty-text: foobar; }"; })";
-+
-+    QVERIFY(w.property("styleSheet").toString().isEmpty());
-+
-+    w.setStyleSheet(sheet);
-+    QCOMPARE(checkBox->text(), "check");
-+
-+    //recursion crash
-+    w.ensurePolished();
-+    QCOMPARE(w.property("styleSheet").toString(), sheet);
-+    QCOMPARE(checkBox->text(), "foobar");
-+}
-+
- namespace ns {
-     class PushButton1 : public QPushButton {
-         Q_OBJECT
diff --git a/debian/patches/series b/debian/patches/series
index 49a1526..0a3370d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
 fusion_checkable_qpushbutton.diff
 mysql_remove_version_checks.diff
 full_width_selection_rtl.diff
-fix_recursion_crash.diff
 xcb_add_a_timeout_control_when_reading_INCR_property.diff
 
 # Debian specific.