diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-09 13:11:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-09 11:19:25 +0000 |
| commit | 03f365f93e8dab6bcd8473b5f5ba172bab200e1f (patch) | |
| tree | 2cbcdbd95765b8ed9bbfd899c25cb4a6b088e4b0 /util | |
| parent | af7b0534c6d6c42c949a802952dab981d64d1f6f (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 2ced79af85..4f8c158cc1 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": |