From 80eb3fcca83c901d184b5fa5fc520e1e8abf0aa5 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 28 Aug 2022 19:21:19 +0300 Subject: [PATCH] fix log output of the windows buildbot system g --- params.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/params.cpp b/params.cpp index 5591b19..be9ccb4 100644 --- a/params.cpp +++ b/params.cpp @@ -43,7 +43,11 @@ void Params::log(const QString &log, VerboseLvl vLvl) { switch (vLvl) { case VerboseLvl::Error: +#ifdef Q_OS_WIN32 + std::cerr << QString{lvlToString(vLvl) + ": " + log}.toStdString() << std::endl; +#else qCritical() << lvlToString(vLvl) + ": " + log; +#endif #ifdef QA_ASSERT_ON_ERROR debug_assert(false, "You requested to throw assert in every error message." @@ -52,7 +56,12 @@ void Params::log(const QString &log, VerboseLvl vLvl) { break; case VerboseLvl::Warning: { +#ifdef Q_OS_WIN32 + std::cerr << QString{lvlToString(vLvl) + ": " + log}.toStdString() << std::endl; +#else qWarning() << lvlToString(vLvl) + ": " + log; +#endif + #ifdef QA_ASSERT_ON_WARN debug_assert(false, "You requested to throw assert in every warning message." @@ -61,19 +70,24 @@ void Params::log(const QString &log, VerboseLvl vLvl) { break; } case VerboseLvl::Debug: { +#ifdef Q_OS_WIN32 + std::cout << QString{lvlToString(vLvl) + ": " + log}.toStdString() << std::endl; +#else qDebug() << lvlToString(vLvl) + ": " + log; +#endif break; } - case VerboseLvl::Info: { - qInfo() << lvlToString(vLvl) + ": " + log; - break; - } - + case VerboseLvl::Info: default: { +#ifdef Q_OS_WIN32 + std::cout << QString{lvlToString(vLvl) + ": " + log}.toStdString() << std::endl; +#else qInfo() << lvlToString(vLvl) + ": " + log; +#endif break; } + } }