diff options
| author | Christian Ehrlicher <[email protected]> | 2024-11-09 22:46:52 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <[email protected]> | 2024-11-11 18:34:08 +0000 |
| commit | 482c41fb6187f3ee1df11e7936fb60f65d12995a (patch) | |
| tree | 5a39eb961c36884c615c9c9343f52d8773d84584 /src/widgets/kernel | |
| parent | 1ad9330a9c56a59d407f5644fe547ba69c1a205b (diff) | |
QWidget: delete 'extra' in dtor
Call d->deleteExtra() in dtor of QWidget to make sure it's cleaned up
before QWidgetPrivate calls it which might access the already deleted
QWidget through deleteTLSysExtra() /
QWindowContainer::toplevelAboutToBeDestroyed(q).
Amends 006cbf658ea1f5986bbe1baafa7c146780320661.
Pick-to: 6.8 6.8.1
Task-number: QTBUG-130932
Change-Id: I9109072a457cc01abd5d1b4e844a3ed3309d942b
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 23e543ee3ee..4d351fe893d 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1581,6 +1581,7 @@ QWidget::~QWidget() #if QT_CONFIG(graphicseffect) delete d->graphicsEffect; #endif + d->deleteExtra(); d->isWidget = false; } |