From 3d02e75c07fd5a460b72fc0cbffb199a3cb8a14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 2 Feb 2018 12:11:13 +0100 Subject: Unconditionally log to stderr, regardless of qt_logging_to_console() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tor Arne Vestbø --- src/corelib/global/qlogging.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') 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); -- cgit v1.2.3