diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-28 21:25:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-18 14:44:12 +0000 |
| commit | 33c969a453a2585969c60cd86ede86387345ab2b (patch) | |
| tree | baac4ba05ca04e0264979c9f99b46a1e118630f0 /src/linguist/shared/qmakeevaluator.cpp | |
| parent | 085311534e6e4d0efcb62c4a2fcbc7b06db17bd0 (diff) | |
| download | qttools-33c969a453a2585969c60cd86ede86387345ab2b.tar.gz | |
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/linguist/shared/qmakeevaluator.cpp')
| -rw-r--r-- | src/linguist/shared/qmakeevaluator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index e3fcbd73a..6323d4c00 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -314,7 +314,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 ' ': |