summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/processstep.cpp
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2009-11-25 18:50:20 +0100
committerdt <qtc-committer@nokia.com>2009-11-30 15:24:31 +0100
commita312206306e85258e2ee9ac649a9b5ae00a92ef6 (patch)
tree212d9d7ad270d942aadda0608580f369250aa3e1 /src/plugins/projectexplorer/processstep.cpp
parent7949d93a1ab80f6173d6de1ab146378ce6256c88 (diff)
downloadqt-creator-a312206306e85258e2ee9ac649a9b5ae00a92ef6.tar.gz
Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things. This compiles, more work is coming.
Diffstat (limited to 'src/plugins/projectexplorer/processstep.cpp')
-rw-r--r--src/plugins/projectexplorer/processstep.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 0add381c24..e442fc14d6 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -65,12 +65,12 @@ ProcessStep::ProcessStep(ProcessStep *bs, BuildConfiguration *bc)
bool ProcessStep::init()
{
- setEnvironment(buildConfiguration()->project()->environment(buildConfiguration()));
+ setEnvironment(buildConfiguration()->environment());
QString wd = workingDirectory();
if (wd.isEmpty())
wd = "$BUILDDIR";
- AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", buildConfiguration()->project()->buildDirectory(buildConfiguration())));
+ AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", buildConfiguration()->buildDirectory()));
AbstractProcessStep::setCommand(m_command);
AbstractProcessStep::setEnabled(m_enabled);
AbstractProcessStep::setArguments(m_arguments);