diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
| commit | 17198e03ab36e5f579a1477b09cc3e601975eb5f (patch) | |
| tree | 61ba826e9edd53469abdc1e1f58b1223d0336c56 /examples/widgets/desktop | |
| parent | a5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff) | |
| parent | 2e2b32a9ab459f6618d02e4b454c75a787172def (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/corelib/global/qglobal.cpp
src/corelib/tools/qstring.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/plugins/platforms/eglfs/api/qeglfsglobal.h
Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'examples/widgets/desktop')
| -rw-r--r-- | examples/widgets/desktop/systray/doc/src/systray.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/desktop/systray/doc/src/systray.qdoc b/examples/widgets/desktop/systray/doc/src/systray.qdoc index aa70561638..b89fed72e0 100644 --- a/examples/widgets/desktop/systray/doc/src/systray.qdoc +++ b/examples/widgets/desktop/systray/doc/src/systray.qdoc @@ -137,7 +137,7 @@ to show the message with the title, body, and icon for the time specified in milliseconds. - OS X users note: The Growl notification system must be + \macos users note: The Growl notification system must be installed for QSystemTrayIcon::showMessage() to display messages. QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::} @@ -172,7 +172,7 @@ 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 OS X we need to + users when they are closing the editor window. On \macos 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 |