From 00caa645ff064d9c26e70699b9f14c62172b71c9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 8 Feb 2025 14:39:21 -0800 Subject: [PATCH] QLoggingCategory: remove #ifndef QT_BOOTSTRAPPED Amends commit 670810787318df8a80b2197b49448c18a78bb7ed from 6.8, which removed qloggingregistry.cpp from the bootstrap library build. Pick-to: 6.8 Change-Id: I3bb5609707478df771b8fffd3e71eb889eaac53f Reviewed-by: Edward Welbourne (cherry picked from commit 696e11ec729452d246e736e54790411b408f9c3c) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qloggingregistry.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 32e8fdec659..62fffc6ab7e 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -303,12 +303,10 @@ void QLoggingRegistry::initializeRules() const QString configFileName = QStringLiteral("qtlogging.ini"); -#if !defined(QT_BOOTSTRAPPED) // get rules from Qt data configuration path const QString qtConfigPath = QDir(QLibraryInfo::path(QLibraryInfo::DataPath)).absoluteFilePath(configFileName); qr = loadRulesFromFile(qtConfigPath); -#endif // get rules from user's/system configuration const QString envPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation,