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

CMake: CMakeConfigurationKitInformation::setup fix

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2016-12-21 11:50:43 +01:00
parent 81b255e960
commit 5698736284
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -624,7 +624,7 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const
void CMakeConfigurationKitInformation::setup(Kit *k) void CMakeConfigurationKitInformation::setup(Kit *k)
{ {
if (k) if (k && !k->hasValue(CONFIGURATION_ID))
k->setValue(CONFIGURATION_ID, defaultValue(k)); k->setValue(CONFIGURATION_ID, defaultValue(k));
} }