diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 12:59:45 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 11:12:58 +0000 |
| commit | 126fe0fa0b58e3d70ca1109336f784d5659c846f (patch) | |
| tree | e3e709a002e17af626191858e5ceeb628f2f1749 /plugins/haskell/haskellbuildconfiguration.cpp | |
| parent | 160059525a52aa43e6ef694dec8a65691d35bd75 (diff) | |
Adapt to changes in Qt Creator 4.11
Change-Id: Ife586f245ffb60626372701e649b8f1df9e5aea5
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'plugins/haskell/haskellbuildconfiguration.cpp')
| -rw-r--r-- | plugins/haskell/haskellbuildconfiguration.cpp | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/plugins/haskell/haskellbuildconfiguration.cpp b/plugins/haskell/haskellbuildconfiguration.cpp index 0233e15..ebf5960 100644 --- a/plugins/haskell/haskellbuildconfiguration.cpp +++ b/plugins/haskell/haskellbuildconfiguration.cpp @@ -58,35 +58,20 @@ HaskellBuildConfigurationFactory::HaskellBuildConfigurationFactory() setSupportedProjectMimeTypeName(Constants::C_HASKELL_PROJECT_MIMETYPE); } -static QList<BuildInfo> createInfos(const HaskellBuildConfigurationFactory *factory, - const Kit *k, - const Utils::FilePath &projectFilePath) +QList<BuildInfo> HaskellBuildConfigurationFactory::availableBuilds( + const Kit *k, const Utils::FilePath &projectPath, bool forSetup) const { - BuildInfo info(factory); + BuildInfo info(this); info.typeName = HaskellBuildConfigurationFactory::tr("Release"); - info.displayName = info.typeName; - info.buildDirectory = projectFilePath.parentDir().pathAppended(".stack-work"); + if (forSetup) { + info.displayName = info.typeName; + info.buildDirectory = projectPath.parentDir().pathAppended(".stack-work"); + } info.kitId = k->id(); info.buildType = BuildConfiguration::BuildType::Release; return {info}; } -QList<BuildInfo> HaskellBuildConfigurationFactory::availableBuilds(const Target *parent) const -{ - // Entries that are available in add build configuration dropdown - return Utils::transform(createInfos(this, parent->kit(), parent->project()->projectFilePath()), - [](BuildInfo info) { - info.displayName.clear(); - return info; - }); -} - -QList<BuildInfo> HaskellBuildConfigurationFactory::availableSetups( - const Kit *k, const QString &projectPath) const -{ - return createInfos(this, k, Utils::FilePath::fromString(projectPath)); -} - HaskellBuildConfiguration::HaskellBuildConfiguration(Target *target, Core::Id id) : BuildConfiguration(target, id) {} @@ -106,12 +91,12 @@ void HaskellBuildConfiguration::setBuildType(BuildConfiguration::BuildType type) m_buildType = type; } -void HaskellBuildConfiguration::initialize(const BuildInfo &info) +void HaskellBuildConfiguration::initialize() { - BuildConfiguration::initialize(info); - setBuildDirectory(info.buildDirectory); - setBuildType(info.buildType); - setDisplayName(info.displayName); + BuildConfiguration::initialize(); + setBuildDirectory(initialBuildDirectory()); + setBuildType(initialBuildType()); + setDisplayName(initialDisplayName()); BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); auto stackBuildStep = new StackBuildStep(buildSteps); |