diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-11-02 14:25:20 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-11-14 11:52:52 +0000 |
| commit | b10cdba1752b232a990ba2432c4bb6d634f933ec (patch) | |
| tree | cec545b8b0f2fb5413c466cea43b808ccc67a54a | |
| parent | 780c3a44249f5c5e2019ce9273c28699511cd40e (diff) | |
| download | qtrepotools-b10cdba1752b232a990ba2432c4bb6d634f933ec.tar.gz | |
qt6_tool: Improve dependency ordering
Add soft dependencies if they are present in the module list.
This fixes a number of issues, for example serialbus not building
modbus since serialport is a soft dependency.
Change-Id: I2a75f7829c5a7fd226a4ef747b563800307e87bd
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| -rwxr-xr-x | bin/qt6_tool | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/qt6_tool b/bin/qt6_tool index 432aad3..83f273f 100755 --- a/bin/qt6_tool +++ b/bin/qt6_tool @@ -322,8 +322,8 @@ def sort_by_dependencies(desired_module_list, modules_dependency_dict): if module in desired_module_list: required_dependencies = [] for dep_module, param_dict in dependencies.items(): - if (param_dict.get('required') or - (module == 'qtdeclarative' and dep_module == 'qtshadertools')): + required = bool(param_dict.get('required')) + if required or dep_module in desired_module_list: required_dependencies.append(dep_module) simple_dependencies[module] = required_dependencies # Brute force: Keep adding modules all of whose requirements are present |