diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-28 21:25:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-28 13:03:02 +0000 |
| commit | 36a8d8dcc5747b0e97b4a69f760024bc6621179f (patch) | |
| tree | 552856346761a95c80d1cc6772f50eaa630a58f4 /src/shared/proparser | |
| parent | 40d48f86a077bda77670939074c7d7a3256d6951 (diff) | |
fix quote nesting in split_value_list()
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)
Diffstat (limited to 'src/shared/proparser')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 20bdd310ac4..fe14d581dc3 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -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 ' ': |