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

Make sure we don't leave unconfigured Custom Executable RC laying around

Browse Source 
Task-Nr: QTCREATORBUG-2222
This commit is contained in:
dt
2010-08-31 13:57:32 +02:00
parent ba876ffd48
commit 160cf4096c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/cmaketarget.cpp
View File

@@ -107,9 +107,14 @@ void CMakeTarget::updateRunConfigurations()
{
// *Update* runconfigurations:
QMultiMap<QString, CMakeRunConfiguration*> existingRunConfigurations;
foreach(ProjectExplorer::RunConfiguration* cmakeRunConfiguration, runConfigurations()) {
if (CMakeRunConfiguration* rc = qobject_cast<CMakeRunConfiguration *>(cmakeRunConfiguration))
existingRunConfigurations.insert(rc->title(), rc);
QList<ProjectExplorer::RunConfiguration *> toRemove;
foreach(ProjectExplorer::RunConfiguration* rc, runConfigurations()) {
if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc))
existingRunConfigurations.insert(cmakeRC->title(), cmakeRC);
ProjectExplorer::CustomExecutableRunConfiguration *ceRC =
qobject_cast<ProjectExplorer::CustomExecutableRunConfiguration *>(rc);
if (ceRC && !ceRC->isConfigured())
toRemove << rc;
}
foreach(const CMakeBuildTarget &ct, cmakeProject()->buildTargets()) {
@@ -142,6 +147,10 @@ void CMakeTarget::updateRunConfigurations()
rc->setEnabled(false);
// removeRunConfiguration(rc);
}
foreach (ProjectExplorer::RunConfiguration *rc, toRemove)
removeRunConfiguration(rc);
if (runConfigurations().isEmpty()) {
// Oh no, no run configuration,
// create a custom executable run configuration