gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-qt/qtdeclarative: backport fix for QTBUG-129500 in 6.8.0

Browse Source 
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2024-11-04 23:14:14 -05:00
parent 6130944f83
commit d9fd350987
2 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129500.patch Normal file
View File

@@ -0,0 +1,80 @@
Prevents crashes in Neochat and other kirigami-based applications.
https://bugreports.qt.io/browse/QTBUG-129500
https://codereview.qt-project.org/c/qt/qtdeclarative/+/595278
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -8757,7 +8757,8 @@
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);
@@ -8864,7 +8865,8 @@
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
@@ -49,3 +49,14 @@
}
}
+
+ 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
@@ -2884,4 +2884,31 @@
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);
}

1
dev-qt/qtdeclarative/qtdeclarative-6.8.0-r4.ebuild → dev-qt/qtdeclarative/qtdeclarative-6.8.0-r5.ebuild
View File

@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch
"${FILESDIR}"/${PN}-6.7.3-QTBUG-129622.patch
"${FILESDIR}"/${PN}-6.8.0-QTBUG-129797.patch
"${FILESDIR}"/${PN}-6.8.0-QTBUG-129500.patch
)
src_configure() {