diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-14 18:06:30 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-20 20:19:14 (GMT) |
| commit | f8efbfb774679aa81648974e049605981532ec17 (patch) | |
| tree | 230bebd5f217d5395b4bde1be83348db05d1b6df /qmake/project.cpp | |
| parent | 79893e1f90b04317fde14069684534ba29d74f5b (diff) | |
| download | Qt-f8efbfb774679aa81648974e049605981532ec17.zip Qt-f8efbfb774679aa81648974e049605981532ec17.tar.gz Qt-f8efbfb774679aa81648974e049605981532ec17.tar.bz2 | |
close scope while inside assignment only if the last char is a closing brace
the code assumed it anyway and would make a mess if it was wrong
Reviewed-by: joerg
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index c3595fe..214b013 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1046,7 +1046,7 @@ QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place, int num SKIP_WS(d, d_off, s.length()); QString vals = s.mid(d_off); // vals now contains the space separated list of values int rbraces = vals.count('}'), lbraces = vals.count('{'); - if(scope_blocks.count() > 1 && rbraces - lbraces == 1) { + if(scope_blocks.count() > 1 && rbraces - lbraces == 1 && vals.endsWith('}')) { debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.toLatin1().constData(), parser.line_no, scope_blocks.count()); ScopeBlock sb = scope_blocks.pop(); |