diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-16 17:45:16 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-28 11:41:38 +0200 |
commit | a7bb77288d28160daabbc00179e77736886ce8d2 (patch) | |
tree | 04dcfc73f09e702e0597f9b1c8ff05313dc50f5c /src/plugins/qt4projectmanager/makestep.cpp | |
parent | 52a41ecb0c455b9979b2a55cc5f96b078b696996 (diff) | |
download | qt-creator-a7bb77288d28160daabbc00179e77736886ce8d2.tar.gz |
BC: Move builddirectory handling into BC itself
Use setBuildDirectory() in the different BuildConfigurations instead
of reimplementing that over and over again.
Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/makestep.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/makestep.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 02a76cdec3..c0b0fb81d0 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -173,7 +173,7 @@ bool MakeStep::init() if (bc->subNodeBuild()) workingDirectory = bc->subNodeBuild()->buildDir(); else - workingDirectory = bc->buildDirectory(); + workingDirectory = bc->buildDirectory().toString(); pp->setWorkingDirectory(workingDirectory); QString makeCmd = tc->makeCommand(bc->environment()); @@ -415,7 +415,7 @@ void MakeStepConfigWidget::updateDetails() ProcessParameters param; param.setMacroExpander(bc->macroExpander()); - param.setWorkingDirectory(bc->buildDirectory()); + param.setWorkingDirectory(bc->buildDirectory().toString()); QString makeCmd = tc->makeCommand(bc->environment()); if (!m_makeStep->makeCommand().isEmpty()) makeCmd = m_makeStep->makeCommand(); |