diff options
| author | hjk <hjk@qt.io> | 2019-12-09 12:59:38 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-12-09 14:12:45 +0000 |
| commit | 041a86c8c7d8a7e563655c5ae4dae08752ceaad8 (patch) | |
| tree | f1434adf884c101bc6741ab63c3565b56346a1e6 /src/plugins/autotoolsprojectmanager | |
| parent | b82add7813384c19879044b44796db1f8f067ad3 (diff) | |
ProjectExplorer: Use function object for special build config init
Change-Id: I5da0f28ee1a64f8d9a3145f059019be702bee463
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp | 37 | ||||
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h | 2 |
2 files changed, 18 insertions, 21 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index 0950ae46bc..406347aba0 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -53,26 +53,25 @@ AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent, Core::I setBuildDirectory(Utils::FilePath::fromString("/<foobar>")); setBuildDirectoryHistoryCompleter("AutoTools.BuildDir.History"); setConfigWidgetDisplayName(tr("Autotools Manager")); -} -void AutotoolsBuildConfiguration::initialize() -{ - // ### Build Steps Build ### - // autogen.sh or autoreconf - QFile autogenFile(target()->project()->projectDirectory().toString() + "/autogen.sh"); - if (autogenFile.exists()) - buildSteps()->appendStep(Constants::AUTOGEN_STEP_ID); - else - buildSteps()->appendStep(Constants::AUTORECONF_STEP_ID); - - // ./configure. - buildSteps()->appendStep(Constants::CONFIGURE_STEP_ID); - - // make - buildSteps()->appendStep(Constants::MAKE_STEP_ID); - - // ### Build Steps Clean ### - cleanSteps()->appendStep(Constants::MAKE_STEP_ID); + setInitializer([this] { + // ### Build Steps Build ### + // autogen.sh or autoreconf + QFile autogenFile(target()->project()->projectDirectory().toString() + "/autogen.sh"); + if (autogenFile.exists()) + buildSteps()->appendStep(Constants::AUTOGEN_STEP_ID); + else + buildSteps()->appendStep(Constants::AUTORECONF_STEP_ID); + + // ./configure. + buildSteps()->appendStep(Constants::CONFIGURE_STEP_ID); + + // make + buildSteps()->appendStep(Constants::MAKE_STEP_ID); + + // ### Build Steps Clean ### + cleanSteps()->appendStep(Constants::MAKE_STEP_ID); + }); } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h index 1b2bcf8021..d3c89c9d59 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h @@ -38,8 +38,6 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration friend class ProjectExplorer::BuildConfigurationFactory; AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); - - void initialize() override; }; class AutotoolsBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory |