From e5f11eebc89ec041995cbbbc9b3db9eb3c6968c2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 1 Apr 2025 07:59:51 +0200 Subject: [PATCH] QAbstractItemView: disconnect from the correct delegate Purely from a symmetry argument, we should be disconnecting the old item delegate, not the new one. I didn't find a case where this actually causes test failures, nor did I take the time to implement a test where it does. Amends a126d3627cc347500c1a6bd82027efa6d451ccbd. That patch landed in Qt 6.7, but that branch is "closed" at this point in time, so not picking there now. Pick-to: 6.9 6.8 Change-Id: I06b704e699616d61c65ad676ffe45dfbd9f8a870 Reviewed-by: Volker Hilsheimer --- src/widgets/itemviews/qabstractitemview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 090ac232a6e..e84ea0a8b7b 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -861,7 +861,7 @@ void QAbstractItemView::setItemDelegate(QAbstractItemDelegate *delegate) if (d->itemDelegate) { if (d->delegateRefCount(d->itemDelegate) == 1) - d->disconnectDelegate(delegate); + d->disconnectDelegate(d->itemDelegate); } if (delegate) {