summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qlogging.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2025-01-14 15:20:57 -0800
committerThiago Macieira <thiago.macieira@intel.com>2025-01-21 19:28:39 -0800
commit5ca803a3d0e3cd656a7d22b26ce1d4d168d95f02 (patch)
treebce7790401b3bd63a826e2533338c0a99dccbd5c /src/corelib/global/qlogging.cpp
parentdb5163dca9e1f0c64a2881e1b3e2a7fc15b2bfbe (diff)
QMessageLogger: simplify the backtrace code
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>
Diffstat (limited to 'src/corelib/global/qlogging.cpp')
-rw-r--r--src/corelib/global/qlogging.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index b046ee34e8e..02a5b0a0ce1 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -1116,12 +1116,12 @@ struct QMessagePattern
#ifndef QT_BOOTSTRAPPED
std::chrono::steady_clock::time_point appStartTime = std::chrono::steady_clock::now();
#endif
-#ifdef QLOGGING_HAVE_BACKTRACE
struct BacktraceParams
{
QString backtraceSeparator;
int backtraceDepth;
};
+#ifdef QLOGGING_HAVE_BACKTRACE
QList<BacktraceParams> backtraceArgs; // backtrace arguments in sequence of %{backtrace
int maxBacktraceDepth = 0;
#endif
@@ -1141,9 +1141,7 @@ struct QMessagePattern
}
#endif
};
-#ifdef QLOGGING_HAVE_BACKTRACE
Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_RELOCATABLE_TYPE);
-#endif
Q_CONSTINIT QBasicMutex QMessagePattern::mutex;