From 0441935fcbadf843257bcabd0584dcfadccd82c0 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 2 Jun 2026 12:52:15 +0200 Subject: [PATCH] configure: Sanitize -submodules arguments Allow (and ignore) leading, trailing, and repeated commas in the -submodules argument. Fixes: QTBUG-147198 Change-Id: I8901a65c6754c58ea3d51cb715932e7b328af445 Reviewed-by: Alexandru Croitor (cherry picked from commit d6ac43b43338c1bde122a13ad242b6a748e106f9) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit f1698cf6463d549b6e7628eda92a1bed127261c2) --- cmake/QtIRHelpers.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/QtIRHelpers.cmake b/cmake/QtIRHelpers.cmake index 6df58b7f..ea929374 100644 --- a/cmake/QtIRHelpers.cmake +++ b/cmake/QtIRHelpers.cmake @@ -142,6 +142,7 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var) qt_ir_get_top_level_submodules(include_submodules exclude_submodules) if(NOT include_submodules AND arg_ALREADY_INITIALIZED) string(REPLACE "," ";" include_submodules "${submodules}") + list(FILTER include_submodules EXCLUDE REGEX "^$") endif() # qtrepotools is always implicitly cloned, but it doesn't actually