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

Qmake: Do not turn a CONFIG variable with spaces into several

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2016-06-24 10:35:23 +02:00
parent fccd50d32b
commit 0d4150bda9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmakeprojectmanager/makefileparse.cpp
View File

@@ -208,10 +208,11 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
} else { } else {
newValues.append(value); newValues.append(value);
} }
}
if (!newValues.isEmpty()) {
QMakeAssignment newQA = qa; QMakeAssignment newQA = qa;
newQA.value = newValues.join(QLatin1Char(' ')); newQA.value = newValues.join(QLatin1Char(' '));
if (!newValues.isEmpty()) assignments->append(newQA);
assignments->append(newQA);
} }
} else { } else {
assignments->append(qa); assignments->append(qa);