whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLoggingCategory: remove #ifndef QT_BOOTSTRAPPED 

Amends commit 6708107873 from 6.8, which
removed qloggingregistry.cpp from the bootstrap library build.

Change-Id: I3bb5609707478df771b8fffd3e71eb889eaac53f
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 696e11ec729452d246e736e54790411b408f9c3c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 00caa645ff064d9c26e70699b9f14c62172b71c9)
bb10
Thiago Macieira 2025-02-08 14:39:21 -08:00 committed by Qt Cherry-pick Bot
parent 154560df21
commit ffdb68209d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qloggingregistry.cpp
View File

@ -304,12 +304,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,