From 4e7657321165d183d96c738d9732d56fee85fc6d Mon Sep 17 00:00:00 2001 From: Sergey Belyashov Date: Mon, 16 Dec 2013 12:16:35 +0400 Subject: [PATCH] Separate shadow build directory suffixes and build configuration name Task-number: QTCREATORBUG-11113 Change-Id: Idbf1a52d550a76128bb06ccc65029555fe001078 Reviewed-by: Oswald Buddenhagen Reviewed-by: Denis Shienkov Reviewed-by: Daniel Teske --- .../qmakeprojectmanager/qmakebuildconfiguration.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index da00fc54a8c..d69f090e916 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -553,18 +553,24 @@ QmakeBuildInfo *QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k, { QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); QmakeBuildInfo *info = new QmakeBuildInfo(this); - if (type == BuildConfiguration::Release) + QString suffix; + if (type == BuildConfiguration::Release) { //: The name of the release build configuration created by default for a qmake project. info->displayName = tr("Release"); - else + //: Non-ASCII characters in directory suffix may cause build issues. + suffix = tr("Release", "Shadow build directory suffix"); + } else { //: The name of the debug build configuration created by default for a qmake project. info->displayName = tr("Debug"); + //: Non-ASCII characters in directory suffix may cause build issues. + suffix = tr("Debug", "Shadow build directory suffix"); + } info->typeName = tr("Build"); // Leave info->buildDirectory unset; info->kitId = k->id(); info->supportsShadowBuild = (version && version->supportsShadowBuilds()); info->buildDirectory - = defaultBuildDirectory(info->supportsShadowBuild, projectPath, k, info->displayName); + = defaultBuildDirectory(info->supportsShadowBuild, projectPath, k, suffix); info->type = type; return info; }