From fd2daeab37100c33b74ce90cb2e6fdfe30165601 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 2 Sep 2010 10:01:32 +0200
Subject: [PATCH] Do not use shadowbuilding in projects from 1.3
Do not turn on shadow building when importing projects created
(and last opened) by creator <1.3
Task-number: QTCREATORBUG-2231
---
src/plugins/projectexplorer/userfileaccessor.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index d82b5be6617..e9feb7e784d 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -493,7 +493,6 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const
qWarning() << "Unknown BuildConfiguration Key found:" << i.key() << i.value();
qWarning() << "BuildConfiguration Id is:" << id;
}
-
return result;
}
@@ -919,9 +918,13 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
targetMap.insert(QLatin1String("ProjectExplorer.Target.BuildConfigurationCount"), count);
for (int i = 0; i < count; ++i) {
QString key(QString::fromLatin1("ProjectExplorer.Project.BuildConfiguration.") + QString::number(i));
- if (map.contains(key))
+ if (map.contains(key)) {
+ QVariantMap bcMap = map.value(key).toMap();
+ if (!bcMap.contains(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild")))
+ bcMap.insert(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild"), false);
targetMap.insert(QString::fromLatin1("ProjectExplorer.Target.BuildConfiguration.") + QString::number(i),
- map.value(key));
+ bcMap);
+ }
}
count = map.value(QLatin1String("ProjectExplorer.Project.RunConfigurationCount")).toInt();
--
GitLab