From 87e642a4b6133fd5ed2293e8d97afe6e6df0b0a6 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 27 Nov 2009 12:09:53 +0100
Subject: [PATCH] Fix bugs introduced by refactoring
---
src/plugins/projectexplorer/buildsettingspropertiespage.cpp | 4 ++--
src/plugins/projectexplorer/project.cpp | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 45d939d5b03..12f8e13983f 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -254,8 +254,8 @@ void BuildSettingsWidget::updateBuildSettings()
m_subWidgets->addWidget(subConfigWidget->displayName(), subConfigWidget);
// Add tree items
- foreach (const BuildConfiguration *bc, m_project->buildConfigurations()) {
- m_buildConfigurationComboBox->addItem(bc->displayName(), bc);
+ foreach (BuildConfiguration *bc, m_project->buildConfigurations()) {
+ m_buildConfigurationComboBox->addItem(bc->displayName(), QVariant::fromValue(bc));
if (bc == m_buildConfiguration)
m_buildConfigurationComboBox->setCurrentIndex(m_buildConfigurationComboBox->count() - 1);
}
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 0ab59706c78..7ab2c9591af 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -271,6 +271,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
}
}
}
+ addBuildConfiguration(bc);
}
// Set Active Configuration
--
GitLab