diff --git a/src/libs/utils/outputformat.h b/src/libs/utils/outputformat.h index 2a6cabfc2d74b5c673de4e3d860a88e20166d7ce..4d4cb907a8b6a06009fe1f6335f009972efbd0aa 100644 --- a/src/libs/utils/outputformat.h +++ b/src/libs/utils/outputformat.h @@ -39,6 +39,7 @@ enum OutputFormat { NormalMessageFormat, ErrorMessageFormat, + DebugFormat, StdOutFormat, StdErrFormat, StdOutFormatSameLine, diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index 4097de93d69dc47336313e583e7edf36689c850e..c13348075712939c814c2478c12f1eed6ef161f6 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -117,6 +117,9 @@ void OutputFormatter::initFormats() m_formats[StdErrFormat].setFont(m_font); m_formats[StdErrFormat].setForeground(mixColors(p.color(QPalette::Text), QColor(Qt::red))); m_formats[StdErrFormatSameLine] = m_formats[StdErrFormat]; + + m_formats[DebugFormat].setFont(m_font); + m_formats[DebugFormat].setForeground(mixColors(p.color(QPalette::Text), QColor(Qt::magenta))); } void OutputFormatter::handleLink(const QString &href) diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index d72a8051bc025fe1f6fae61edc98cb371e7ad0df..7ff518a5b37b6454eb8162dc1740c41eca4d4666 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -167,9 +167,9 @@ enum LogChannel LogTime, // Used for time stamp messages LogDebug, LogMisc, - AppOutput, - AppError, - AppStuff, + AppOutput, // stdout + AppError, // stderr + AppStuff, // (possibly) windows debug channel StatusBar, // LogStatus and also put to the status bar ScriptConsoleOutput }; diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index a87d1b9f5b12bf338881ff4006bd806b28e6745a..89d4437a2e3fc8ca12272a74d857635781e57cbd 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -304,7 +304,7 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel) appendMessage(msg, Utils::StdErrFormatSameLine); break; case AppStuff: - appendMessage(msg, Utils::NormalMessageFormat); + appendMessage(msg, Utils::DebugFormat); break; } } diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp index fac9abba095290361260c7b3c9b19cd795e897b5..b28cf138cb4d52e53ef741592c3aa6bce4efeb7b 100644 --- a/src/plugins/projectexplorer/applicationlauncher_win.cpp +++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp @@ -134,7 +134,7 @@ void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStd void ApplicationLauncher::readWinDebugOutput(const QString &output) { - emit appendMessage(output, Utils::StdErrFormat); + emit appendMessage(output, Utils::DebugFormat); } void ApplicationLauncher::processStopped()