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

Logging: remove const from the lambda calling dladdr

Browse Source 
In some OSes, the function takes a plain void*.

Fixes: QTBUG-106980
Change-Id: I810d70e579eb4e2c8e45fffd1718bdaf94d8ac0e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 7d7d4671bd641634bd7ab8fd523ca96f7cda95ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-09-27 07:23:44 -07:00 committed by Qt Cherry-pick Bot
parent ea730ed599
commit f5dda2390f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1302,7 +1302,7 @@ static QStringList backtraceFramesForLogMessage(int frameCount)
// use dladdr() instead of backtrace_symbols() // use dladdr() instead of backtrace_symbols()
QString cachedLibrary; QString cachedLibrary;
const char *cachedFname = nullptr; const char *cachedFname = nullptr;
auto decodeFrame = [&](const void *addr) -> DecodedFrame { auto decodeFrame = [&](void *addr) -> DecodedFrame {
Dl_info info; Dl_info info;
if (!dladdr(addr, &info)) if (!dladdr(addr, &info))
return {}; return {};