From 753d035e152f0572ba99717d04116a882a506bef Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 17 Aug 2024 21:12:25 +0200 Subject: [PATCH] QLoggingRegistry: Misc fixes Fix the name of the env var in the debug output for QT_LOGGING_CONF and adjust the documentation to not suggest to add quotes around the value of QT_LOGGING_RULES as this will not get properly parsed. Pick-to: 6.8 Change-Id: I2da4f841c42c6af6e73d09f19d9baada3582bcd1 Reviewed-by: Thiago Macieira --- .../doc/snippets/code/src_corelib_io_qloggingcategory.cpp | 2 +- src/corelib/io/qloggingregistry.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qloggingcategory.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qloggingcategory.cpp index 0a7a718e310..dfea973adfe 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qloggingcategory.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qloggingcategory.cpp @@ -17,5 +17,5 @@ //! [2] //! [3] - QT_LOGGING_RULES="*.debug=false;driver.usb.debug=true" + QT_LOGGING_RULES=*.debug=false;driver.usb.debug=true //! [3] diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index b4181a2fa6d..7745b8ad945 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -278,7 +278,7 @@ void QLoggingRegistry::initializeRules() { if (qtLoggingDebug()) { debugMsg("Initializing the rules database ..."); - debugMsg("Checking %s environment variable", "QTLOGGING_CONF"); + debugMsg("Checking %s environment variable", "QT_LOGGING_CONF"); } QList er, qr, cr; // get rules from environment