diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 96fc649e28c..a6d2b201408 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1370,7 +1370,7 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi const QString projectName = projectFilePath.parentDir().fileName(); const FilePath projectDir = Project::projectDirectory(projectFilePath); FilePath buildPath = BuildConfiguration::buildDirectoryFromTemplate(projectDir, - projectFilePath, projectName, k, bcName, buildType, BuildConfiguration::ReplaceSpaces); + projectFilePath, projectName, k, bcName, buildType); if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) { QString path = buildPath.path(); diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp index b603f856b35..4e10f6ce195 100644 --- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp +++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp @@ -85,7 +85,7 @@ FilePath MesonBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi const QString projectName = projectFilePath.parentDir().fileName(); return BuildConfiguration::buildDirectoryFromTemplate( Project::projectDirectory(projectFilePath), - projectFilePath, projectName, k, bcName, buildType, BuildConfiguration::ReplaceSpaces); + projectFilePath, projectName, k, bcName, buildType); } ProjectExplorer::BuildSystem *MesonBuildConfiguration::buildSystem() const diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 6d584e803ee..749874adf49 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -604,8 +604,7 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD const QString &projectName, const Kit *kit, const QString &bcName, - BuildType buildType, - SpaceHandling spaceHandling) + BuildType buildType) { MacroExpander exp; @@ -644,8 +643,7 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD qCDebug(bcLog) << "build dir template:" << buildDir; buildDir = exp.expand(buildDir); qCDebug(bcLog) << "expanded build:" << buildDir; - if (spaceHandling == ReplaceSpaces) - buildDir.replace(" ", "-"); + buildDir.replace(" ", "-"); return projectDir.resolvePath(buildDir); } diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 5a8c15e7da6..89747e05429 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -110,14 +110,12 @@ public: static QString buildTypeName(BuildType type); - enum SpaceHandling { KeepSpace, ReplaceSpaces }; static Utils::FilePath buildDirectoryFromTemplate(const Utils::FilePath &projectDir, const Utils::FilePath &mainFilePath, const QString &projectName, const Kit *kit, const QString &bcName, - BuildType buildType, - SpaceHandling spaceHandling = ReplaceSpaces); + BuildType buildType); bool isActive() const;