From 03f365f93e8dab6bcd8473b5f5ba172bab200e1f Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 9 Oct 2019 13:11:58 +0200 Subject: [PATCH] cmake scripts: fix conversion of qmldir files I broke the depends in 3a103b360802b81318a20063f2b4884864e79b15 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 --- util/cmake/pro2cmake.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 2ced79af854..4f8c158cc1c 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -438,7 +438,7 @@ class QmlDir: 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: @@ -518,6 +518,8 @@ class QmlDir: 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":