aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/buildsteplist.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2010-08-25 13:09:55 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2010-08-25 13:11:29 +0200
commit22fe4f584d26ac3f877722e3fc5457dc0f0b9b89 (patch)
tree11ed6fba288f349832f26789676ff8ad67e0f811 /src/plugins/projectexplorer/buildsteplist.cpp
parent8346e354eea3919dd294024a943b16e620a8f30c (diff)
Set id of buildstepslist in fromMap() asap
* This unbreaks restoration of some steps.
Diffstat (limited to 'src/plugins/projectexplorer/buildsteplist.cpp')
-rw-r--r--src/plugins/projectexplorer/buildsteplist.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp
index a2e415fa9a..4c82937aba 100644
--- a/src/plugins/projectexplorer/buildsteplist.cpp
+++ b/src/plugins/projectexplorer/buildsteplist.cpp
@@ -144,6 +144,10 @@ void BuildStepList::cloneSteps(BuildStepList *source)
bool BuildStepList::fromMap(const QVariantMap &map)
{
+ // We need the ID set before trying to restore the steps!
+ if (!ProjectConfiguration::fromMap(map))
+ return false;
+
int maxSteps = map.value(QString::fromLatin1(STEPS_COUNT_KEY), 0).toInt();
for (int i = 0; i < maxSteps; ++i) {
QVariantMap bsData(map.value(QString::fromLatin1(STEPS_PREFIX) + QString::number(i)).toMap());
@@ -163,7 +167,7 @@ bool BuildStepList::fromMap(const QVariantMap &map)
}
insertStep(m_steps.count(), bs);
}
- return ProjectConfiguration::fromMap(map);
+ return true;
}
QList<BuildStep *> BuildStepList::steps() const