feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotool: Move buildDirectoryChanged connection

Browse Source 
... to a place where the potential receiver already exists.

It had not even a chance to work before.

Change-Id: Id6ca2fe522636dcd03b81c5da513f48549b8eb76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-12-20 18:59:35 +01:00
parent c136e81422
commit 23296e0084
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -61,12 +61,7 @@ AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent)
{ {
// /<foobar> is used so the un-changed check in setBuildDirectory() works correctly. // /<foobar> is used so the un-changed check in setBuildDirectory() works correctly.
// The leading / is to avoid the relative the path expansion in BuildConfiguration::buildDirectory. // The leading / is to avoid the relative the path expansion in BuildConfiguration::buildDirectory.
BuildConfiguration::setBuildDirectory(Utils::FileName::fromString(QString::fromLatin1("/<foobar>"))); setBuildDirectory(Utils::FileName::fromString("/<foobar>"));
connect(this, &BuildConfiguration::buildDirectoryChanged, this, [this] {
foreach (auto bs, stepList(BUILDSTEPS_BUILD)->allOfType<ConfigureStep>())
bs->notifyBuildDirectoryChanged();
});
} }
void AutotoolsBuildConfiguration::initialize(const BuildInfo *info) void AutotoolsBuildConfiguration::initialize(const BuildInfo *info)
@@ -90,6 +85,8 @@ void AutotoolsBuildConfiguration::initialize(const BuildInfo *info)
// ./configure. // ./configure.
ConfigureStep *configureStep = new ConfigureStep(buildSteps); ConfigureStep *configureStep = new ConfigureStep(buildSteps);
buildSteps->insertStep(1, configureStep); buildSteps->insertStep(1, configureStep);
connect(this, &BuildConfiguration::buildDirectoryChanged,
configureStep, &ConfigureStep::notifyBuildDirectoryChanged);
// make // make
MakeStep *makeStep = new MakeStep(buildSteps); MakeStep *makeStep = new MakeStep(buildSteps);