aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmakeprojectmanager/makefileparse.cpp
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2016-06-24 10:35:23 +0200
committerTobias Hunger <[email protected]>2016-06-27 14:05:20 +0000
commit0d4150bda95a3fcd8986f5e3e06975301f41e5b5 (patch)
treed2836514bb6bc6be27890dd89552ed57042a7c4f /src/plugins/qmakeprojectmanager/makefileparse.cpp
parentfccd50d32b37b3276af03f28dd3af463cab1dec6 (diff)
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 <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/makefileparse.cpp5
1 files 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);