From bbf944e373ae92238c77f08b6f53ad534cf05a74 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Wed, 14 Dec 2016 11:32:01 +0100
Subject: [PATCH] ToolChainKitInformation: Preserve sticky bit on upgrade

Change-Id: I774fe7acc5c1a820eee4361547c034c9558fcb6d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/projectexplorer/kitinformation.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 6f6ee76fc60..05e407dfff1 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -197,7 +197,9 @@ QList<Task> ToolChainKitInformation::validate(const Kit *k) const
 void ToolChainKitInformation::upgrade(Kit *k)
 {
     // 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());
     if (value.isNull() && !oldValue.isNull()) {
         QVariantMap newValue;
@@ -216,6 +218,7 @@ void ToolChainKitInformation::upgrade(Kit *k)
             }
         }
         k->setValue(ToolChainKitInformation::id(), newValue);
+        k->setSticky(ToolChainKitInformation::id(), k->isSticky(oldId));
     }
 }