diff options
| author | Doris Verria <doris.verria@qt.io> | 2021-10-13 13:35:10 +0200 |
|---|---|---|
| committer | Doris Verria <doris.verria@qt.io> | 2021-10-14 10:19:29 +0200 |
| commit | ec09900997e9b92206938ca5f9fe2e356440e513 (patch) | |
| tree | 0014d2b5b852cb4d8f93b85878d5fe3f9682b24a /src/gui/kernel | |
| parent | dcb281af7dc1a41813300ea74f1890902f6bf748 (diff) | |
Call QWidget close handling in QWidget::close for non-toplevel native widgets
Since commit 7ba75d0 we close the QWindow in QWidget::close for native
widgets and trigger the closeEvent in QWidgetWindow. However, if the
widget's window handle is not a top level window, QWindow::close()
will not close the window, failing in this way to deliver the
closeEvent and call the close handling in QWidgetPrivate::handleClose.
To fix, call handleClose() from QWidget::close for such widgets.
Task-number: QTBUG-74606
Pick-to: 6.2
Change-Id: Ied342eced3340aaf19b5443762935b1a5fc5c27b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 590c56eab8..61756a3834 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2258,7 +2258,7 @@ bool QWindow::close() Q_D(QWindow); // Do not close non top level windows - if (parent()) + if (!isTopLevel()) return false; if (!d->platformWindow) |