diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-28 21:25:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-05-20 18:11:12 +0000 |
| commit | c9270d66395c90068388857c8fd201c62fb5e96f (patch) | |
| tree | 4b81768b2e0d36001e916eb85aaba2202bb8fa4d /qmake | |
| parent | f37381e29246b5fc984aaff6cd07731c33b4e0df (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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 5c9dc45f3a..acf09c11aa 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/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 ' ': |