summaryrefslogtreecommitdiffstats
path: root/examples/widgets/desktop/systray/doc/src/systray.qdoc
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2021-11-22 17:39:20 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2021-12-03 18:17:41 +0000
commit46cadf7b48288fce4de6147ae38de493354c23d0 (patch)
tree2c9c82d35d135ff233056629accb55490ea37a01 /examples/widgets/desktop/systray/doc/src/systray.qdoc
parent6598a26a138aaab13e28905a28e7ce21011d30b5 (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/doc/src/systray.qdoc')
-rw-r--r--examples/widgets/desktop/systray/doc/src/systray.qdoc8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/desktop/systray/doc/src/systray.qdoc b/examples/widgets/desktop/systray/doc/src/systray.qdoc
index ae7e925bd8..3a2c1bfa6b 100644
--- a/examples/widgets/desktop/systray/doc/src/systray.qdoc
+++ b/examples/widgets/desktop/systray/doc/src/systray.qdoc
@@ -173,11 +173,11 @@
We have reimplemented the QWidget::closeEvent() event handler to
receive widget close events, showing the above message to the
- users when they are closing the editor window. On \macos we need to
+ users when they are closing the editor window. We need to
avoid showing the message and accepting the close event when the
- user really intends to quit the application, that is, when the
- user has triggered "Quit" in the menu bar or pressed the Command+Q
- shortcut.
+ user really intends to quit the application: that is, when the
+ user has triggered "Quit" in the menu bar, or in the tray icon's
+ context menu, or pressed Command+Q shortcut on \macOS.
In addition to the functions and slots discussed above, we have
also implemented several convenience functions to simplify the