diff options
| author | hjk <hjk@qt.io> | 2020-01-31 14:05:19 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-01-31 14:00:29 +0000 |
| commit | b5188475a52b052a1b771cb6f60a1dd249b30126 (patch) | |
| tree | 52769bae0a3cf5b4cf2eb012fc748c8bac47a13a /plugins/haskell/haskellbuildconfiguration.cpp | |
| parent | 9dd2477c2a9f7383e9eaa0b6f6b1f7691baae1f1 (diff) | |
Adapt to upstream build configuration factory changes
Change-Id: I6b541df3ee1599be17e5fec17cc7fa251061ba4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'plugins/haskell/haskellbuildconfiguration.cpp')
| -rw-r--r-- | plugins/haskell/haskellbuildconfiguration.cpp | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/plugins/haskell/haskellbuildconfiguration.cpp b/plugins/haskell/haskellbuildconfiguration.cpp index dcd582a..a587ef1 100644 --- a/plugins/haskell/haskellbuildconfiguration.cpp +++ b/plugins/haskell/haskellbuildconfiguration.cpp @@ -27,7 +27,6 @@ #include "haskellconstants.h" #include "haskellproject.h" -#include "stackbuildstep.h" #include <projectexplorer/buildinfo.h> #include <projectexplorer/buildsteplist.h> @@ -56,20 +55,18 @@ HaskellBuildConfigurationFactory::HaskellBuildConfigurationFactory() registerBuildConfiguration<HaskellBuildConfiguration>(C_HASKELL_BUILDCONFIGURATION_ID); setSupportedProjectType(Constants::C_HASKELL_PROJECT_ID); setSupportedProjectMimeTypeName(Constants::C_HASKELL_PROJECT_MIMETYPE); -} -QList<BuildInfo> HaskellBuildConfigurationFactory::availableBuilds( - const Kit *k, const Utils::FilePath &projectPath, bool forSetup) const -{ - BuildInfo info(this); - info.typeName = HaskellBuildConfigurationFactory::tr("Release"); - if (forSetup) { - info.displayName = info.typeName; - info.buildDirectory = projectPath.parentDir().pathAppended(".stack-work"); - } - info.kitId = k->id(); - info.buildType = BuildConfiguration::BuildType::Release; - return {info}; + setBuildGenerator([](const Kit *k, const Utils::FilePath &projectPath, bool forSetup) { + BuildInfo info; + info.typeName = HaskellBuildConfiguration::tr("Release"); + if (forSetup) { + info.displayName = info.typeName; + info.buildDirectory = projectPath.parentDir().pathAppended(".stack-work"); + } + info.kitId = k->id(); + info.buildType = BuildConfiguration::BuildType::Release; + return QList<BuildInfo>{info}; + }); } HaskellBuildConfiguration::HaskellBuildConfiguration(Target *target, Core::Id id) @@ -79,10 +76,8 @@ HaskellBuildConfiguration::HaskellBuildConfiguration(Target *target, Core::Id id setBuildDirectory(info.buildDirectory); setBuildType(info.buildType); setDisplayName(info.displayName); - - auto stackBuildStep = new StackBuildStep(buildSteps()); - buildSteps()->appendStep(stackBuildStep); }); + appendInitialBuildStep(Constants::C_STACK_BUILD_STEP_ID); } NamedWidget *HaskellBuildConfiguration::createConfigWidget() |