From 569873628477bef7d64345260e5698912ec683db Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Wed, 21 Dec 2016 11:50:43 +0100
Subject: [PATCH] CMake: CMakeConfigurationKitInformation::setup fix

CMakeConfigurationKitInformation::setup did override the existing value
when it was called. That is not intended, the setup method should only
set a value if none exists.

Change-Id: I86d386982311020dc3dbb3a705e1ff87ad02e09c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 418974c3d7c..94047a9c7b6 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -624,7 +624,7 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const
 
 void CMakeConfigurationKitInformation::setup(Kit *k)
 {
-    if (k)
+    if (k && !k->hasValue(CONFIGURATION_ID))
         k->setValue(CONFIGURATION_ID, defaultValue(k));
 }