len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-13 15:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Logger Qt6 fixes.

Browse source 
Fix various issues with building CuteLogger with Qt6.

Change-Id: Iceac8f8a19f6703868c5a41b725d3cd69c724239
This commit is contained in:
Dominik Riebeling 2020-08-16 12:04:15 +02:00
parent cd352d9052
commit 94eb1df58b
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/rbutilqt/logger/src/Logger.cpp
View file

@ -600,8 +600,13 @@ Logger::~Logger()
// Cleanup appenders
QMutexLocker appendersLocker(&d->loggerMutex);
#if QT_VERSION >= 0x050e00
QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>(d->appenders.begin(), d->appenders.end()));
deleteList.unite(QSet<AbstractAppender*>(d->categoryAppenders.values().begin(), d->categoryAppenders.values().end()));
#else
QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders));
deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values()));
#endif
qDeleteAll(deleteList);
appendersLocker.unlock();
@ -1032,7 +1037,11 @@ void LoggerTimingHelper::start(const char* msg, ...)
{
va_list va;
va_start(va, msg);
#if QT_VERSION >= 0x050500
m_block = QString().vasprintf(msg, va);
#else
m_block = QString().vsprintf(msg, va);
#endif
va_end(va);
m_time.start();
@ -1062,7 +1071,7 @@ LoggerTimingHelper::~LoggerTimingHelper()
else
message = QString(QLatin1String("\"%1\" finished in ")).arg(m_block);
int elapsed = m_time.elapsed();
qint64 elapsed = m_time.elapsed();
if (elapsed >= 10000 && m_timingMode == Logger::TimingAuto)
message += QString(QLatin1String("%1 s.")).arg(elapsed / 1000);
else