Skip to content

Commit

Permalink
cmake scripts: fix conversion of qmldir files
Browse files Browse the repository at this point in the history
I broke the depends in 3a103b3 wrongly
assuming it was dead code. Bring it back and actually fix the type to be
a list of tuples.

Change-Id: I96f04843ff2e2293969b5ba0efe02fb51dc88404
Reviewed-by: Alexandru Croitor <[email protected]>
  • Loading branch information
gladhorn committed Oct 9, 2019
1 parent af7b053 commit 03f365f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion util/cmake/pro2cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ def __init__(self) -> None:
self.imports: List[str] = []
self.type_names: Dict[str, QmlDirFileInfo] = {}
self.type_infos: List[str] = []
self.depends: List[str] = []
self.depends: List[Tuple[str, str]] = []
self.designer_supported = False

def __str__(self) -> str:
Expand Down Expand Up @@ -518,6 +518,8 @@ def from_file(self, path: str):
self.classname = entries[1]
elif entries[0] == "typeinfo":
self.type_infos.append(entries[1])
elif entries[0] == "depends":
self.depends.append((entries[1], entries[2]))
elif entries[0] == "designersupported":
self.designer_supported = True
elif entries[0] == "import":
Expand Down

0 comments on commit 03f365f

Please sign in to comment.