diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-06 09:32:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-06 09:32:13 +0200 |
| commit | 1a464f35d19fbf6a5cbe93b2a2d52f2f44465913 (patch) | |
| tree | 7306fbbb50429d66cf4d3d08e60e7310431b9f85 /src/corelib | |
| parent | 061fbceb777c41b23bc2b8180b2af85d9b35b246 (diff) | |
| parent | b6f7230cda02d9b11b309816ca1e41dbd2716fe0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic811cd444e523b904211797112bba6aaec85dddd
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 2d8b860c5b..b75b218201 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -4439,7 +4439,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) Calls the message handler with the critical message \a message. If no message handler has been installed, the message is printed to stderr. Under Windows, the message is sent to the debugger. - On QNX the message is sent to slogger2 + On QNX the message is sent to slogger2. It exits if the environment variable QT_FATAL_CRITICALS is not empty. @@ -4472,7 +4472,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) Calls the message handler with the fatal message \a message. If no message handler has been installed, the message is printed to stderr. Under Windows, the message is sent to the debugger. - On QNX the message is sent to slogger2 + On QNX the message is sent to slogger2. If you are using the \b{default message handler} this function will abort to create a core dump. On Windows, for debug builds, |