From 00d3fcf1093c81fd343bd13ab0e9713d4ac0858f Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 2 Jul 2024 11:17:03 +0200 Subject: [PATCH] Clean up logging categories Use Q_STATIC_LOGGING_CATEGORY for logging categories local to a single translation unit to silence deprecation warnings after 374a2b0c5fe8b4a6c52f39a20075f1282ce76b96. Task-number: QTBUG-67692 Change-Id: I82d2b2bfcba46508e6ee16219951fefe80215d26 Reviewed-by: Ulf Hermann --- src/corelib/text/qlocale_mac.mm | 2 +- src/gui/platform/darwin/qapplekeymapper.mm | 4 +++- src/network/access/qnetworkaccessmanager.cpp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/corelib/text/qlocale_mac.mm b/src/corelib/text/qlocale_mac.mm index 89339be2ebc..2f560936472 100644 --- a/src/corelib/text/qlocale_mac.mm +++ b/src/corelib/text/qlocale_mac.mm @@ -25,7 +25,7 @@ using namespace Qt::StringLiterals; ** Wrappers for Mac locale system functions */ -Q_LOGGING_CATEGORY(lcLocale, "qt.core.locale") +Q_STATIC_LOGGING_CATEGORY(lcLocale, "qt.core.locale") static void printLocalizationInformation() { diff --git a/src/gui/platform/darwin/qapplekeymapper.mm b/src/gui/platform/darwin/qapplekeymapper.mm index 9166d8baba3..a36df93d8b9 100644 --- a/src/gui/platform/darwin/qapplekeymapper.mm +++ b/src/gui/platform/darwin/qapplekeymapper.mm @@ -18,7 +18,9 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQpaKeyMapperKeys, "qt.qpa.keymapper.keys"); +#ifdef Q_OS_MACOS +Q_STATIC_LOGGING_CATEGORY(lcQpaKeyMapperKeys, "qt.qpa.keymapper.keys"); +#endif static Qt::KeyboardModifiers swapModifiersIfNeeded(const Qt::KeyboardModifiers modifiers) { diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 610491e5709..b9703bfc285 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -70,7 +70,9 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; using namespace std::chrono_literals; -Q_LOGGING_CATEGORY(lcQnam, "qt.network.access.manager") +#if defined(Q_OS_MACOS) +Q_STATIC_LOGGING_CATEGORY(lcQnam, "qt.network.access.manager") +#endif Q_APPLICATION_STATIC(QNetworkAccessFileBackendFactory, fileBackend)