From aa0e38c607b4fff36576ee4197073e0d46365aed Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 19 Feb 2025 10:44:12 +0100 Subject: [PATCH] Fix: Use `_qt_internal_set_source_file_generated` `SKIP_AUTOGEN` was a bit too zealous. Hotfix for 6865c21e41be5d86b5a04889bfe28fac55c89f29 Fixes: QTBUG-133850 Change-Id: I6ec984a7a5d8eefb56e53a0f56c4f4384a56e0ae Reviewed-by: Nicolas Fella Reviewed-by: Alexandru Croitor (cherry picked from commit 97517b20aaaccb9f2bfa6d571a71f40560507476) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreMacros.cmake | 2 +- src/widgets/Qt6WidgetsMacros.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 33c730d6711..a036bef1d92 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -527,7 +527,7 @@ function(qt6_add_big_resources outfiles ) COMMENT "Running rcc pass 1 for resource ${outfilename}" VERBATIM) add_custom_target(big_resources_${outfilename} ALL DEPENDS ${tmpoutfile}) - _qt_internal_set_source_file_generated(SOURCES ${tmpoutfile} SKIP_AUTOGEN) + _qt_internal_set_source_file_generated(SOURCES ${tmpoutfile}) _qt_internal_add_rcc_pass2( RESOURCE_NAME ${outfilename} RCC_OPTIONS ${rcc_options} diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake index a28f2a17e7d..a5f5f17f4ca 100644 --- a/src/widgets/Qt6WidgetsMacros.cmake +++ b/src/widgets/Qt6WidgetsMacros.cmake @@ -31,12 +31,12 @@ function(qt6_wrap_ui outfiles ) ARGS ${ui_options} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) + _qt_internal_set_source_file_generated( + SOURCES ${outfile} + SKIP_AUTOGEN + ) list(APPEND ${outfiles} ${outfile}) endforeach() - _qt_internal_set_source_file_generated( - SOURCES ${${outfiles}} - SKIP_AUTOGEN - ) set(${outfiles} ${${outfiles}} PARENT_SCOPE) endfunction()