From f8efbfb774679aa81648974e049605981532ec17 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 May 2010 20:06:30 +0200 Subject: 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 --- qmake/project.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 &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(); -- cgit v0.12