diff options
Diffstat (limited to 'rbutil/rbutilqt/logger/src/Logger.cpp')
-rw-r--r-- | rbutil/rbutilqt/logger/src/Logger.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/logger/src/Logger.cpp b/rbutil/rbutilqt/logger/src/Logger.cpp index 16a18db728..689bc42e80 100644 --- a/rbutil/rbutilqt/logger/src/Logger.cpp +++ b/rbutil/rbutilqt/logger/src/Logger.cpp | |||
@@ -600,8 +600,13 @@ Logger::~Logger() | |||
600 | 600 | ||
601 | // Cleanup appenders | 601 | // Cleanup appenders |
602 | QMutexLocker appendersLocker(&d->loggerMutex); | 602 | QMutexLocker appendersLocker(&d->loggerMutex); |
603 | #if QT_VERSION >= 0x050e00 | ||
604 | QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>(d->appenders.begin(), d->appenders.end())); | ||
605 | deleteList.unite(QSet<AbstractAppender*>(d->categoryAppenders.values().begin(), d->categoryAppenders.values().end())); | ||
606 | #else | ||
603 | QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders)); | 607 | QSet<AbstractAppender*> deleteList(QSet<AbstractAppender*>::fromList(d->appenders)); |
604 | deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values())); | 608 | deleteList.unite(QSet<AbstractAppender*>::fromList(d->categoryAppenders.values())); |
609 | #endif | ||
605 | qDeleteAll(deleteList); | 610 | qDeleteAll(deleteList); |
606 | 611 | ||
607 | appendersLocker.unlock(); | 612 | appendersLocker.unlock(); |
@@ -1032,7 +1037,11 @@ void LoggerTimingHelper::start(const char* msg, ...) | |||
1032 | { | 1037 | { |
1033 | va_list va; | 1038 | va_list va; |
1034 | va_start(va, msg); | 1039 | va_start(va, msg); |
1040 | #if QT_VERSION >= 0x050500 | ||
1041 | m_block = QString().vasprintf(msg, va); | ||
1042 | #else | ||
1035 | m_block = QString().vsprintf(msg, va); | 1043 | m_block = QString().vsprintf(msg, va); |
1044 | #endif | ||
1036 | va_end(va); | 1045 | va_end(va); |
1037 | 1046 | ||
1038 | m_time.start(); | 1047 | m_time.start(); |
@@ -1062,7 +1071,7 @@ LoggerTimingHelper::~LoggerTimingHelper() | |||
1062 | else | 1071 | else |
1063 | message = QString(QLatin1String("\"%1\" finished in ")).arg(m_block); | 1072 | message = QString(QLatin1String("\"%1\" finished in ")).arg(m_block); |
1064 | 1073 | ||
1065 | int elapsed = m_time.elapsed(); | 1074 | qint64 elapsed = m_time.elapsed(); |
1066 | if (elapsed >= 10000 && m_timingMode == Logger::TimingAuto) | 1075 | if (elapsed >= 10000 && m_timingMode == Logger::TimingAuto) |
1067 | message += QString(QLatin1String("%1 s.")).arg(elapsed / 1000); | 1076 | message += QString(QLatin1String("%1 s.")).arg(elapsed / 1000); |
1068 | else | 1077 | else |