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

Do not use shadowbuilding in projects from 1.3

Browse Source 
Do not turn on shadow building when importing projects created
(and last opened) by creator <1.3

Task-number: QTCREATORBUG-2231
This commit is contained in:
Tobias Hunger
2010-09-02 10:01:32 +02:00
parent 1f0b600b82
commit fd2daeab37
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/userfileaccessor.cpp
View File

@@ -493,7 +493,6 @@ QVariantMap Version0Handler::convertBuildConfigurations(Project *project, const
qWarning() << "Unknown BuildConfiguration Key found:" << i.key() << i.value(); qWarning() << "Unknown BuildConfiguration Key found:" << i.key() << i.value();
qWarning() << "BuildConfiguration Id is:" << id; qWarning() << "BuildConfiguration Id is:" << id;
} }
return result; return result;
} }
@@ -919,9 +918,13 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
targetMap.insert(QLatin1String("ProjectExplorer.Target.BuildConfigurationCount"), count); targetMap.insert(QLatin1String("ProjectExplorer.Target.BuildConfigurationCount"), count);
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
QString key(QString::fromLatin1("ProjectExplorer.Project.BuildConfiguration.") + QString::number(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), targetMap.insert(QString::fromLatin1("ProjectExplorer.Target.BuildConfiguration.") + QString::number(i),
map.value(key)); bcMap);
}
} }
count = map.value(QLatin1String("ProjectExplorer.Project.RunConfigurationCount")).toInt(); count = map.value(QLatin1String("ProjectExplorer.Project.RunConfigurationCount")).toInt();