From 0d4150bda95a3fcd8986f5e3e06975301f41e5b5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 24 Jun 2016 10:35:23 +0200
Subject: [PATCH] Qmake: Do not turn a CONFIG variable with spaces into several

When e.g. examining 'CONFIG+=foo bar' Creator would turn that into
CONFIG+=foo and 'CONFIG+=foo bar', which seems wrong to me.

Task-number: QTCREATORBUG-16492
Change-Id: I37b83f1e8415d421abb2df7a9466651bff502d17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/plugins/qmakeprojectmanager/makefileparse.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index 8b63e87f47c..2b284d9808c 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -208,10 +208,11 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
                 } else {
                     newValues.append(value);
                 }
+            }
+            if (!newValues.isEmpty()) {
                 QMakeAssignment newQA = qa;
                 newQA.value = newValues.join(QLatin1Char(' '));
-                if (!newValues.isEmpty())
-                    assignments->append(newQA);
+                assignments->append(newQA);
             }
         } else {
             assignments->append(qa);