CMake: pro2cmake.py: Do not double-report include files

Do not add scopes that are going to get merged into their parent scope
as a child of the parent scope. This leads to the information of the
child scope being duplicated.

Change-Id: If4d6a83b9c9eac477959e7774e9cf65fd4df98e6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
bb10
Tobias Hunger 2019-01-18 12:44:15 +01:00
parent cc593426eb
commit 29ff5f77ee
1 changed files with 2 additions and 2 deletions

View File

@ -901,9 +901,9 @@ def do_include(scope: Scope, *, debug: bool = False) -> None:
include_result = parseProFile(include_file, debug=debug)
include_scope \
= Scope.FromDict(scope, include_file,
= Scope.FromDict(None, include_file,
include_result.asDict().get('statements'),
'', dir)
'', dir) # This scope will be merged into scope, so no parent_scope!
do_include(include_scope)