mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-24 16:05:36 +08:00
1d4da9a59b
This amends commit378c8719a9. Since378c8719a9, -skip is registered as a known option in init-repository's option parser. This caused -skip values to be consumed during option parsing and no longer appear in the unknown_args list that gets forwarded to configure. As a result, -skip was silently ignored when -init-submodules was not passed. Fix by collecting skip modules into a dedicated list from two sources: the -skip option values consumed by init-repository's parser, and exclusion entries from -submodules/--module-subset. The merged list is then forwarded to configure. This also simplifies the previous merge logic that searched for -skip in filtered_args, which became dead code after378c8719a9. Pick-to: 6.8 6.10 6.11 Task-number: QTBUG-140359 Change-Id: I816020959f86cf4b8e36ce1a62172acd442ed1d3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>