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/autogenstep.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/autogenstep.cpp')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/autogenstep.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index f8afd63a02c..06071a228e4 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp @@ -158,7 +158,7 @@ bool AutogenStep::init() ProcessParameters *pp = processParameters(); pp->setMacroExpander(bc->macroExpander()); pp->setEnvironment(bc->environment()); - pp->setWorkingDirectory(bc->buildDirectory()); + pp->setWorkingDirectory(bc->buildDirectory().toString()); pp->setCommand(QLatin1String("autogen.sh")); pp->setArguments(additionalArguments()); pp->resolveAll(); @@ -171,9 +171,10 @@ void AutogenStep::run(QFutureInterface<bool> &interface) BuildConfiguration *bc = buildConfiguration(); // Check whether we need to run autogen.sh - const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); - const QFileInfo configureAcInfo(bc->buildDirectory() + QLatin1String("/configure.ac")); - const QFileInfo makefileAmInfo(bc->buildDirectory() + QLatin1String("/Makefile.am")); + const QString buildDir = bc->buildDirectory().toString(); + const QFileInfo configureInfo(buildDir + QLatin1String("/configure")); + const QFileInfo configureAcInfo(buildDir + QLatin1String("/configure.ac")); + const QFileInfo makefileAmInfo(buildDir + QLatin1String("/Makefile.am")); if (!configureInfo.exists() || configureInfo.lastModified() < configureAcInfo.lastModified() @@ -275,7 +276,7 @@ void AutogenStepConfigWidget::updateDetails() ProcessParameters param; param.setMacroExpander(bc->macroExpander()); param.setEnvironment(bc->environment()); - param.setWorkingDirectory(bc->buildDirectory()); + param.setWorkingDirectory(bc->buildDirectory().toString()); param.setCommand(QLatin1String("autogen.sh")); param.setArguments(m_autogenStep->additionalArguments()); m_summaryText = param.summary(displayName()); |