X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Flogging.cpp;h=e42a9e54e94add49cb46b34f3a5ab216650e6c3f;hb=refs%2Fheads%2Fmaster;hp=29d023c04ad577957aa3a1dbacc52fa0a47acb01;hpb=e431acda693abc3d0cd339f95a95220c02ae13bd;p=pulseview.git diff --git a/pv/logging.cpp b/pv/logging.cpp index 29d023c0..7dab545d 100644 --- a/pv/logging.cpp +++ b/pv/logging.cpp @@ -126,10 +126,10 @@ void Logging::log(const QString &text, int source) switch (source) { case LogSource_pv: - s = QString("pv: ") + text; // black is default color + s = QString("pv: %1").arg(text); break; case LogSource_sr: - s = QString("sr: %1").arg(text); + s = QString("sr: %1").arg(text); break; case LogSource_srd: s = QString("srd: %1").arg(text); @@ -189,7 +189,15 @@ int Logging::log_srd(void *cb_data, int loglevel, const char *format, va_list ar va_end(args2); char *text = g_strdup_vprintf(format, args); - logging.log(QString::fromUtf8(text), LogSource_srd); + + QString s = QString::fromUtf8(text); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + for (QString& substring : s.split("\n", Qt::SkipEmptyParts)) + logging.log(substring, LogSource_srd); +#else + for (QString& substring : s.split("\n", QString::SkipEmptyParts)) + logging.log(substring, LogSource_srd); +#endif g_free(text); return SR_OK;