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

QMessageLogger: simplify the backtrace code

Browse Source 
By moving one of the #if, we can remove the other.

Change-Id: I167cf466ef965758e5e8fffd94f8f8169599e3c6
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2025-01-14 15:20:57 -08:00
parent db5163dca9
commit 5ca803a3d0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qlogging.cpp
View File

@ -1116,12 +1116,12 @@ struct QMessagePattern
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
std::chrono::steady_clock::time_point appStartTime = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point appStartTime = std::chrono::steady_clock::now();
#endif #endif
#ifdef QLOGGING_HAVE_BACKTRACE
struct BacktraceParams struct BacktraceParams
{ {
QString backtraceSeparator; QString backtraceSeparator;
int backtraceDepth; int backtraceDepth;
}; };
#ifdef QLOGGING_HAVE_BACKTRACE
QList<BacktraceParams> backtraceArgs; // backtrace arguments in sequence of %{backtrace QList<BacktraceParams> backtraceArgs; // backtrace arguments in sequence of %{backtrace
int maxBacktraceDepth = 0; int maxBacktraceDepth = 0;
#endif #endif
@ -1141,9 +1141,7 @@ struct QMessagePattern
} }
#endif #endif
}; };
#ifdef QLOGGING_HAVE_BACKTRACE
Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_RELOCATABLE_TYPE); Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_RELOCATABLE_TYPE);
#endif
Q_CONSTINIT QBasicMutex QMessagePattern::mutex; Q_CONSTINIT QBasicMutex QMessagePattern::mutex;