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

Fix for Custom build steps

Browse Source
This commit is contained in:
dt
2009-11-24 13:24:47 +01:00
parent 8545851927
commit ce26dd25b1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,11 +216,11 @@ void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)
{ {
QString line = QString::fromLocal8Bit(m_process->readAllStandardError()).trimmed(); QString line = QString::fromLocal8Bit(m_process->readAllStandardError()).trimmed();
if (!line.isEmpty()) if (!line.isEmpty())
stdOut(line); stdError(line);
line = QString::fromLocal8Bit(m_process->readAllStandardOutput()).trimmed(); line = QString::fromLocal8Bit(m_process->readAllStandardOutput()).trimmed();
if (!line.isEmpty()) if (!line.isEmpty())
stdError(line); stdOut(line);
m_eventLoop->exit(0); m_eventLoop->exit(0);
} }

3
src/plugins/projectexplorer/processstep.cpp
View File

@@ -70,6 +70,9 @@ bool ProcessStep::init()
wd = "$BUILDDIR"; wd = "$BUILDDIR";
AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", project()->buildDirectory(buildConfiguration()))); AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", project()->buildDirectory(buildConfiguration())));
AbstractProcessStep::setCommand(m_command);
AbstractProcessStep::setEnabled(m_enabled);
AbstractProcessStep::setArguments(m_arguments);
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }