diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-11-22 17:39:20 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-12-03 18:17:41 +0000 |
| commit | 46cadf7b48288fce4de6147ae38de493354c23d0 (patch) | |
| tree | 2c9c82d35d135ff233056629accb55490ea37a01 /examples/widgets/desktop/systray/window.cpp | |
| parent | 6598a26a138aaab13e28905a28e7ce21011d30b5 (diff) | |
QSystemTrayIcon example: ignore non-spontaneous QCloseEvent
Apparently this code is needed on other platforms now, not only macOS.
Pick-to: 6.2
Fixes: QTBUG-98504
Change-Id: Ie0a7e38609e8fc8c11915784dd3652a3517bb639
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'examples/widgets/desktop/systray/window.cpp')
| -rw-r--r-- | examples/widgets/desktop/systray/window.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp index e62b5fc0d0..f14a4e578f 100644 --- a/examples/widgets/desktop/systray/window.cpp +++ b/examples/widgets/desktop/systray/window.cpp @@ -111,11 +111,8 @@ void Window::setVisible(bool visible) //! [2] void Window::closeEvent(QCloseEvent *event) { -#ifdef Q_OS_MACOS - if (!event->spontaneous() || !isVisible()) { + if (!event->spontaneous() || !isVisible()) return; - } -#endif if (trayIcon->isVisible()) { QMessageBox::information(this, tr("Systray"), tr("The program will keep running in the " |