diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-10 16:47:17 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-10 14:51:37 +0000 |
| commit | 20f4f50a3a84cd0405990d83da008cb7aff2ceaa (patch) | |
| tree | 5ea712fdfdfdc35d80c2412c23af07361ff6a1f7 /util/cmake | |
| parent | f1be97e01ebb22c4a8c6d2c22f685cd38a097148 (diff) | |
Fix invalid condition in module generation
Fix invalid condition which would cause valid qt modules not to be
written out as modules.
Change-Id: Id4b408f2502a34c011595c4602145b6980ee9d58
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 06c11f2d8d..0b814f432f 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -2979,12 +2979,12 @@ def handle_app_or_lib( elif is_plugin: assert not is_example target = write_plugin(cm_fh, scope, indent=indent) - elif is_lib and "qt_module" in scope.get("_LOADED"): - assert not is_example - target = write_module(cm_fh, scope, indent=indent) - elif is_lib: + elif is_lib and not "qt_module" in scope.get("_LOADED"): assert not is_example target = write_generic_library(cm_fh, scope, indent=indent) + elif is_lib or "qt_module" in scope.get("_LOADED"): + assert not is_example + target = write_module(cm_fh, scope, indent=indent) elif "qt_tool" in scope.get("_LOADED"): assert not is_example target = write_tool(cm_fh, scope, indent=indent) |