1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up logging categories

Browse Source 
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 <ulf.hermann@qt.io>
This commit is contained in:
Volker Hilsheimer 2024-07-02 11:17:03 +02:00
parent d16f4cf826
commit 00d3fcf109
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/text/qlocale_mac.mm
View File

@ -25,7 +25,7 @@ using namespace Qt::StringLiterals;
** Wrappers for Mac locale system functions ** Wrappers for Mac locale system functions
*/ */
Q_LOGGING_CATEGORY(lcLocale, "qt.core.locale") Q_STATIC_LOGGING_CATEGORY(lcLocale, "qt.core.locale")
static void printLocalizationInformation() static void printLocalizationInformation()
{ {

4
src/gui/platform/darwin/qapplekeymapper.mm
View File

@ -18,7 +18,9 @@
QT_BEGIN_NAMESPACE 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) static Qt::KeyboardModifiers swapModifiersIfNeeded(const Qt::KeyboardModifiers modifiers)
{ {

4
src/network/access/qnetworkaccessmanager.cpp
View File

@ -70,7 +70,9 @@ QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;
using namespace std::chrono_literals; 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) Q_APPLICATION_STATIC(QNetworkAccessFileBackendFactory, fileBackend)