[Qt-creator] Something wrong with Build Steps?
Daniel Teske
daniel.teske at nokia.com
Tue Nov 24 14:07:06 CET 2009
I think I fixed that with the attached commit.
Note that switching between 1.3.0 and master has probably deleted all your
buildsettings. (1.3.0 can't read the .user files master produces.)
daniel
-------------- next part --------------
commit ce26dd25b1d9d3b750c120931cda1446eac2f937
Author: dt <qtc-committer at nokia.com>
Date: Tue Nov 24 13:24:47 2009 +0100
Fix for Custom build steps
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 3bf8c19..399fd8a 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -216,11 +216,11 @@ void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)
{
QString line = QString::fromLocal8Bit(m_process->readAllStandardError()).trimmed();
if (!line.isEmpty())
- stdOut(line);
+ stdError(line);
line = QString::fromLocal8Bit(m_process->readAllStandardOutput()).trimmed();
if (!line.isEmpty())
- stdError(line);
+ stdOut(line);
m_eventLoop->exit(0);
}
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 3a539cd..eab3735 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -70,6 +70,9 @@ bool ProcessStep::init()
wd = "$BUILDDIR";
AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", project()->buildDirectory(buildConfiguration())));
+ AbstractProcessStep::setCommand(m_command);
+ AbstractProcessStep::setEnabled(m_enabled);
+ AbstractProcessStep::setArguments(m_arguments);
return AbstractProcessStep::init();
}
More information about the Qt-creator-old
mailing list