feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Separate shadow build directory suffixes and build configuration name

Browse Source 
Task-number: QTCREATORBUG-11113
Change-Id: Idbf1a52d550a76128bb06ccc65029555fe001078
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Sergey Belyashov
2013-12-16 12:16:35 +04:00
parent 1178a048fc
commit 4e76573211
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -553,18 +553,24 @@ QmakeBuildInfo *QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k,
{ {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);
QmakeBuildInfo *info = new QmakeBuildInfo(this); 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. //: The name of the release build configuration created by default for a qmake project.
info->displayName = tr("Release"); 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. //: The name of the debug build configuration created by default for a qmake project.
info->displayName = tr("Debug"); 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"); info->typeName = tr("Build");
// Leave info->buildDirectory unset; // Leave info->buildDirectory unset;
info->kitId = k->id(); info->kitId = k->id();
info->supportsShadowBuild = (version && version->supportsShadowBuilds()); info->supportsShadowBuild = (version && version->supportsShadowBuilds());
info->buildDirectory info->buildDirectory
= defaultBuildDirectory(info->supportsShadowBuild, projectPath, k, info->displayName); = defaultBuildDirectory(info->supportsShadowBuild, projectPath, k, suffix);
info->type = type; info->type = type;
return info; return info;
} }