[neon/qt6/qt6-declarative/Neon/release] debian/patches: drop another patch in 6.8.1

[Carlos De Maine]

Git commit 3334b3d0db2a18ef87fe8cb6fcd0925169d7759c by Carlos De Maine.
Committed on 04/12/2024 at 09:32.
Pushed by carlosdem into branch 'Neon/release'.

drop another patch in 6.8.1

D  +0    -84   debian/patches/kirigami_crashes.diff
M  +0    -4    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/3334b3d0db2a18ef87fe8cb6fcd0925169d7759c

diff --git a/debian/patches/kirigami_crashes.diff b/debian/patches/kirigami_crashes.diff
deleted file mode 100644
index 312d2a9..0000000
--- a/debian/patches/kirigami_crashes.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -8756,9 +8756,10 @@
- {
-     QPointF p = mapToScene(point);
-     if (item) {
--        const QQuickWindow *itemWindow = item->window();
--        if (itemWindow != nullptr && itemWindow != window())
--            p = itemWindow->mapFromGlobal(window()->mapToGlobal(p));
-+        const auto *itemWindow = item->window();
-+        const auto *thisWindow = window();
-+        if (thisWindow && itemWindow && itemWindow != thisWindow)
-+            p = itemWindow->mapFromGlobal(thisWindow->mapToGlobal(p));
- 
-         p = item->mapFromScene(p);
-     }
-@@ -8863,9 +8864,10 @@
-     QPointF p = point;
-     if (item) {
-         p = item->mapToScene(point);
--
--        if (item->window() != window())
--            p = window()->mapFromGlobal(item->window()->mapToGlobal(p));
-+        const auto *itemWindow = item->window();
-+        const auto *thisWindow = window();
-+        if (thisWindow && itemWindow && itemWindow != thisWindow)
-+            p = thisWindow->mapFromGlobal(itemWindow->mapToGlobal(p));
-     }
-     return mapFromScene(p);
- }
---- a/tests/auto/quick/qquickitem2/data/mapCoordinatesWithWindows.qml
-+++ b/tests/auto/quick/qquickitem2/data/mapCoordinatesWithWindows.qml
-@@ -48,4 +48,15 @@
-             color: "cyan"
-         }
-     }
-+
-+    property Item itemWithoutWindowA: Item {
-+        x: 20; y: 20
-+    }
-+    property Item itemWithoutWindowB: Item {
-+        x: 40; y: 40
-+        Item {
-+            objectName: "childItemWithoutWindow"
-+            x: 30; y: 30
-+        }
-+    }
- }
---- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-@@ -2883,6 +2883,33 @@
-         globalItemOffset(childItemInChildWindow, childItemInOtherWindow));
-     QCOMPARE(childItemInChildWindow->mapFromItem(childItemInOtherWindow, {0, 0}),
-         globalItemOffset(childItemInOtherWindow, childItemInChildWindow));
-+
-+    // If one or both of the items are not in a scene (yet), they are assumed
-+    // to eventually be in the same scene.
-+
-+    auto *itemWithoutWindowA = root->property("itemWithoutWindowA").value<QQuickItem*>();
-+    QVERIFY(itemWithoutWindowA);
-+    auto *itemWithoutWindowB = root->property("itemWithoutWindowB").value<QQuickItem*>();
-+    QVERIFY(itemWithoutWindowB);
-+    auto *childItemWithoutWindow = itemWithoutWindowB->findChild<QQuickItem*>("childItemWithoutWindow");
-+    QVERIFY(childItemWithoutWindow);
-+
-+    QPoint itemWithoutWindowAPos = itemWithoutWindowA->position().toPoint();
-+    QPoint itemWithoutWindowBPos = itemWithoutWindowB->position().toPoint();
-+
-+    QCOMPARE(itemWithoutWindowA->mapToItem(childItemWithoutWindow, {0, 0}),
-+        itemWithoutWindowAPos - (itemWithoutWindowBPos + childItemWithoutWindow->position()));
-+    QCOMPARE(itemWithoutWindowA->mapFromItem(childItemWithoutWindow, {0, 0}),
-+        (itemWithoutWindowBPos + childItemWithoutWindow->position()) - itemWithoutWindowAPos);
-+
-+    QCOMPARE(itemWithoutWindowA->mapToItem(childItem, {0, 0}),
-+        itemWithoutWindowAPos - itemPos);
-+    QCOMPARE(itemWithoutWindowA->mapFromItem(childItem, {0, 0}),
-+        itemPos - itemWithoutWindowAPos);
-+    QCOMPARE(childItem->mapToItem(itemWithoutWindowA, {0, 0}),
-+        itemPos - itemWithoutWindowAPos);
-+    QCOMPARE(childItem->mapFromItem(itemWithoutWindowA, {0, 0}),
-+        itemWithoutWindowAPos - itemPos);
- }
- 
- void tst_QQuickItem::transforms_data()
diff --git a/debian/patches/series b/debian/patches/series
index a37c39a..292023d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-#carl reported https://codereview.qt-project.org/c/qt/qtdeclarative/+/579714 for backports
-# but superceded by https://codereview.qt-project.org/c/qt/qtdeclarative/+/595278 
-kirigami_crashes.diff
-
 # https://codereview.qt-project.org/c/qt/qtdeclarative/+/604180
 # Engine: Mark created wrapped objects after GCState::MarkWeakValues
 # to fix https://bugs.kde.org/show_bug.cgi?id=494804 and likely some others