diff options
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 069e77c1cb..fcb18d7c18 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1466,7 +1466,7 @@ QWidget::~QWidget() if (isWindow() && isVisible() && internalWinId()) { QT_TRY { - d->handleClose(QWidgetPrivate::CloseNoEvent); + d->close(); } QT_CATCH(...) { // if we're out of memory, at least hide the window. QT_TRY { @@ -8396,6 +8396,10 @@ bool QWidgetPrivate::handleClose(CloseMode mode) QPointer<QWidget> parentWidget = (q->parentWidget() && !QObjectPrivate::get(q->parentWidget())->wasDeleted) ? q->parentWidget() : nullptr; bool quitOnClose = q->testAttribute(Qt::WA_QuitOnClose); + + if (data.in_destructor) + mode = CloseNoEvent; + if (mode != CloseNoEvent) { QCloseEvent e; if (mode == CloseWithSpontaneousEvent) |