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

fix quote nesting in split_value_list()

Browse Source 
a single quote must not disrupt a double quoted string and vice-versa.

Change-Id: Ibb277bc1c930a7dbe9199ca572507ababbcfae4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/c9270d66395c90068388857c8fd201c62fb5e96f)
This commit is contained in:
Oswald Buddenhagen
2015-04-28 21:25:50 +02:00
parent 40d48f86a0
commit 36a8d8dcc5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -311,7 +311,8 @@ ProStringList QMakeEvaluator::split_value_list(const QString &vals, const ProFil
switch (unicode) {
case '"':
case '\'':
quote = unicode;
if (!quote)
quote = unicode;
hadWord = true;
break;
case ' ':