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

QmakeBuildConfiguration: Offer both Debug and Release in "Add Build"

Browse Source 
Change-Id: Iac9749816119dab772c5b6fa34b4d998a68bcab3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-08-21 15:45:04 +02:00
parent 52a52ca09f
commit 14300191a1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,7 +559,7 @@ QmakeBuildInfo *QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k,
//: Non-ASCII characters in directory suffix may cause build issues. //: Non-ASCII characters in directory suffix may cause build issues.
suffix = tr("Debug", "Shadow build directory suffix"); suffix = tr("Debug", "Shadow build directory suffix");
} }
info->typeName = tr("Build"); info->typeName = info->displayName;
// Leave info->buildDirectory unset; // Leave info->buildDirectory unset;
info->kitId = k->id(); info->kitId = k->id();
@@ -589,11 +589,17 @@ int QmakeBuildConfigurationFactory::priority(const Target *parent) const
QList<BuildInfo *> QmakeBuildConfigurationFactory::availableBuilds(const Target *parent) const QList<BuildInfo *> QmakeBuildConfigurationFactory::availableBuilds(const Target *parent) const
{ {
QList<ProjectExplorer::BuildInfo *> result; QList<ProjectExplorer::BuildInfo *> result;
QmakeBuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath().toString(),
BuildConfiguration::Debug); const QString projectFilePath = parent->project()->projectFilePath().toString();
info->displayName.clear(); // ask for a name
info->buildDirectory.clear(); // This depends on the displayName for (BuildConfiguration::BuildType buildType : { BuildConfiguration::Debug,
result << info; BuildConfiguration::Release }) {
QmakeBuildInfo *info = createBuildInfo(parent->kit(), projectFilePath,
buildType);
info->displayName.clear(); // ask for a name
info->buildDirectory.clear(); // This depends on the displayName
result << info;
}
return result; return result;
} }