From 51a6dadc776c45b2055a1203910b7ef7840de8a8 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 8 Apr 2016 14:11:57 +0200
Subject: [PATCH] CMake: Make fromMap more robust for CMakeBuildConfigurations

Do not add broken configuration items read in from the .user file.

Change-Id: Ia4372d040456252fdd0750b597777979ad568ca6
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 93593392e96..57f8c36303a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -105,8 +105,9 @@ bool CMakeBuildConfiguration::fromMap(const QVariantMap &map)
         return false;
 
     const CMakeConfig conf
-    = Utils::transform(map.value(QLatin1String(CONFIGURATION_KEY)).toStringList(),
-                       [](const QString &v) { return CMakeConfigItem::fromString(v); });
+            = Utils::filtered(Utils::transform(map.value(QLatin1String(CONFIGURATION_KEY)).toStringList(),
+                                               [](const QString &v) { return CMakeConfigItem::fromString(v); }),
+                              [](const CMakeConfigItem &c) { return !c.isNull(); });
 
     // Legacy (pre QtC 3.7):
     const QStringList args = QtcProcess::splitArgs(map.value(QLatin1String(INITIAL_ARGUMENTS)).toString());