diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-01 16:12:21 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-05 14:58:12 +0000 |
| commit | ead9c0b1b894505097f4de0039c9b55dd799cf3c (patch) | |
| tree | f6ca0c43bd93906362303cada4528b0f013d5695 /util | |
| parent | 187c466d9aeac94db39e1ad4899663c74e2f54f9 (diff) | |
pro2cmake: Handle Statements before Scopes
This fixes among other things the unit tests.
Change-Id: If9e23735d1d52cf49dc1f03749129fd726e8dea5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 353d22762d..6471f3ff5f 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -331,7 +331,7 @@ class QmakeParser: Statement = pp.Group(Load | Include | Option | DefineTest | FunctionCall | Operation) StatementLine = Statement + EOL - StatementGroup = pp.ZeroOrMore(Scope | EOL | StatementLine) + StatementGroup = pp.ZeroOrMore(StatementLine | Scope | EOL) Block = pp.Suppress('{') + pp.Optional(EOL) \ + pp.ZeroOrMore(EOL | Statement + EOL | Scope) \ |