diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-02 12:11:13 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-05 19:30:09 +0000 |
| commit | 3d02e75c07fd5a460b72fc0cbffb199a3cb8a14a (patch) | |
| tree | 1c7fa86438f538194d5d0984b6547220dbf38688 /src/corelib/global/qlogging.cpp | |
| parent | 64a3bba7b8f0a59a57d8249c266d3eb6c408a761 (diff) | |
Unconditionally log to stderr, regardless of qt_logging_to_console()
Regression after 114f7952217c9c, which incorrectly assumed that checking
qt_logging_to_console() was a safe behavior change to include.
Unfortunately that broke debug output in Qt Creator, as Creator doesn't
seem to run applications with a controlling TTY unless it itself was
started with one, and doesn't set QT_LOGGING_TO_CONSOLE to force log
console output either.
Task-number: QTBUG-66153
Change-Id: I775cb06953122a3f20c16bfe21e19de2d1aa5b52
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib/global/qlogging.cpp')
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index a3cab2b627..c727d5738b 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1664,7 +1664,7 @@ static void qDefaultMessageHandler(QtMsgType type, const QMessageLogContext &con handledStderr |= android_default_message_handler(type, context, message); #endif - if (handledStderr || !qt_logging_to_console()) + if (handledStderr) return; QString formattedMessage = qFormatLogMessage(type, context, message); |