diff options
| author | Tobias Hunger <[email protected]> | 2013-08-16 17:45:16 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2013-08-28 11:41:38 +0200 |
| commit | a7bb77288d28160daabbc00179e77736886ce8d2 (patch) | |
| tree | 04dcfc73f09e702e0597f9b1c8ff05313dc50f5c /src/plugins/autotoolsprojectmanager/configurestep.cpp | |
| parent | 52a41ecb0c455b9979b2a55cc5f96b078b696996 (diff) | |
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 <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/configurestep.cpp')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/configurestep.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index 687fcc924e6..8f0b13d818d 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -158,7 +158,7 @@ bool ConfigureStep::init() ProcessParameters *pp = processParameters(); pp->setMacroExpander(bc->macroExpander()); pp->setEnvironment(bc->environment()); - pp->setWorkingDirectory(bc->buildDirectory()); + pp->setWorkingDirectory(bc->buildDirectory().toString()); pp->setCommand(QLatin1String("configure")); pp->setArguments(additionalArguments()); pp->resolveAll(); @@ -171,8 +171,9 @@ void ConfigureStep::run(QFutureInterface<bool>& interface) BuildConfiguration *bc = buildConfiguration(); //Check whether we need to run configure - const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); - const QFileInfo configStatusInfo(bc->buildDirectory() + QLatin1String("/config.status")); + QString buildDir = bc->buildDirectory().toString(); + const QFileInfo configureInfo(buildDir +QLatin1String("/configure")); + const QFileInfo configStatusInfo(buildDir + QLatin1String("/config.status")); if (!configStatusInfo.exists() || configStatusInfo.lastModified() < configureInfo.lastModified()) { @@ -273,7 +274,7 @@ void ConfigureStepConfigWidget::updateDetails() ProcessParameters param; param.setMacroExpander(bc->macroExpander()); param.setEnvironment(bc->environment()); - param.setWorkingDirectory(bc->buildDirectory()); + param.setWorkingDirectory(bc->buildDirectory().toString()); param.setCommand(QLatin1String("configure")); param.setArguments(m_configureStep->additionalArguments()); m_summaryText = param.summary(displayName()); |