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

ToolChainKitInformation: Preserve sticky bit on upgrade

Browse Source 
Change-Id: I774fe7acc5c1a820eee4361547c034c9558fcb6d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-14 11:32:01 +01:00
parent e76157d285
commit bbf944e373
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -197,7 +197,9 @@ QList<Task> ToolChainKitInformation::validate(const Kit *k) const
void ToolChainKitInformation::upgrade(Kit *k) void ToolChainKitInformation::upgrade(Kit *k)
{ {
// upgrade <=4.1 to 4.2 (keep old settings around for now) // upgrade <=4.1 to 4.2 (keep old settings around for now)
const QVariant oldValue = k->value("PE.Profile.ToolChain"); const Core::Id oldId = "PE.Profile.ToolChain";
const QVariant oldValue = k->value(oldId);
const QVariant value = k->value(ToolChainKitInformation::id()); const QVariant value = k->value(ToolChainKitInformation::id());
if (value.isNull() && !oldValue.isNull()) { if (value.isNull() && !oldValue.isNull()) {
QVariantMap newValue; QVariantMap newValue;
@@ -216,6 +218,7 @@ void ToolChainKitInformation::upgrade(Kit *k)
} }
} }
k->setValue(ToolChainKitInformation::id(), newValue); k->setValue(ToolChainKitInformation::id(), newValue);
k->setSticky(ToolChainKitInformation::id(), k->isSticky(oldId));
} }
} }