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

Fix compile

Browse Source 
Change-Id: I02ffcba805251ce92f50dd283da3dcffff4f7919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-05-06 12:39:24 +02:00
committed by Tobias Hunger
parent 74896187de
commit 7018a375c6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -412,9 +412,10 @@ QVariantMap UserFileAccessor::prepareSettings(const QVariantMap &data) const
// This can not be done in a normal upgrader since the version information is needed
// to decide which upgraders to run
QVariantMap result = SettingsAccessor::prepareSettings(data);
if (data.contains(QLatin1String(OBSOLETE_VERSION_KEY))) {
result = setVersionInMap(result, data.value(key, versionFromMap(data)).toInt());
result.remove(key);
const QString obsoleteKey = QLatin1String(OBSOLETE_VERSION_KEY);
if (data.contains(obsoleteKey)) {
result = setVersionInMap(result, data.value(obsoleteKey, versionFromMap(data)).toInt());
result.remove(obsoleteKey);
}
return result;
}