feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use native separators

Browse Source 
* Force use of native separators when reporting process
   start/stop information in the compile output window
This commit is contained in:
Tobias Hunger
2010-07-07 14:38:57 +02:00
parent 3ba7325bd5
commit 773d580604
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -201,7 +201,7 @@ void AbstractProcessStep::processStarted()
{ {
QTextCharFormat textCharFormat; QTextCharFormat textCharFormat;
textCharFormat.setForeground(Qt::blue); textCharFormat.setForeground(Qt::blue);
emit addOutput(tr("Starting: \"%1\" %2\n").arg(m_command, m_arguments.join(" ")), textCharFormat); emit addOutput(tr("Starting: \"%1\" %2\n").arg(QDir::toNativeSeparators(m_command), m_arguments.join(" ")), textCharFormat);
} }
void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus status) void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus status)
@@ -209,15 +209,15 @@ void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus sta
QTextCharFormat textCharFormat; QTextCharFormat textCharFormat;
if (status == QProcess::NormalExit && exitCode == 0) { if (status == QProcess::NormalExit && exitCode == 0) {
textCharFormat.setForeground(Qt::blue); textCharFormat.setForeground(Qt::blue);
emit addOutput(tr("The process \"%1\" exited normally.").arg(m_command), textCharFormat); emit addOutput(tr("The process \"%1\" exited normally.").arg(QDir::toNativeSeparators(m_command)), textCharFormat);
} else if (status == QProcess::NormalExit) { } else if (status == QProcess::NormalExit) {
textCharFormat.setForeground(Qt::red); textCharFormat.setForeground(Qt::red);
textCharFormat.setFontWeight(QFont::Bold); textCharFormat.setFontWeight(QFont::Bold);
emit addOutput(tr("The process \"%1\" exited with code %2.").arg(m_command, QString::number(m_process->exitCode())), textCharFormat); emit addOutput(tr("The process \"%1\" exited with code %2.").arg(QDir::toNativeSeparators(m_command), QString::number(m_process->exitCode())), textCharFormat);
} else { } else {
textCharFormat.setForeground(Qt::red); textCharFormat.setForeground(Qt::red);
textCharFormat.setFontWeight(QFont::Bold); textCharFormat.setFontWeight(QFont::Bold);
emit addOutput(tr("The process \"%1\" crashed.").arg(m_command), textCharFormat); emit addOutput(tr("The process \"%1\" crashed.").arg(QDir::toNativeSeparators(m_command)), textCharFormat);
} }
} }
@@ -226,7 +226,7 @@ void AbstractProcessStep::processStartupFailed()
QTextCharFormat textCharFormat; QTextCharFormat textCharFormat;
textCharFormat.setForeground(Qt::red); textCharFormat.setForeground(Qt::red);
textCharFormat.setFontWeight(QFont::Bold); textCharFormat.setFontWeight(QFont::Bold);
emit addOutput(tr("Could not start process \"%1\"").arg(m_command), textCharFormat); emit addOutput(tr("Could not start process \"%1\"").arg(QDir::toNativeSeparators(m_command)), textCharFormat);
} }
bool AbstractProcessStep::processSucceeded(int exitCode, QProcess::ExitStatus status) bool AbstractProcessStep::processSucceeded(int exitCode, QProcess::ExitStatus status)