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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
This commit is contained in:
Eike Ziller
2012-10-25 10:45:58 +02:00
parent b9e21803d6 becdcdc4f4
commit 0a1bdf4257
45 changed files with 17728 additions and 12311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/session.cpp
View File

@@ -719,14 +719,14 @@ void SessionManager::restoreDependencies(const Utils::PersistentSettingsReader &
QMap<QString, QVariant>::const_iterator i = depMap.constBegin();
while (i != depMap.constEnd()) {
const QString &key = i.key();
if (m_failedProjects.contains(key))
continue;
QStringList values;
foreach (const QString &value, i.value().toStringList()) {
if (!m_failedProjects.contains(value))
values << value;
if (!m_failedProjects.contains(key)) {
QStringList values;
foreach (const QString &value, i.value().toStringList()) {
if (!m_failedProjects.contains(value))
values << value;
}
m_depMap.insert(key, values);
}
m_depMap.insert(key, values);
++i;
}
}