1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Use _qt_internal_set_source_file_generated

Browse Source 
`SKIP_AUTOGEN` was a bit too zealous.
Hotfix for 6865c21e41be5d86b5a04889bfe28fac55c89f29

Fixes: QTBUG-133850
Change-Id: I6ec984a7a5d8eefb56e53a0f56c4f4384a56e0ae
Reviewed-by: Nicolas Fella <nicolas.fella@kdab.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 97517b20aaaccb9f2bfa6d571a71f40560507476)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Cristian Le 2025-02-19 10:44:12 +01:00 committed by Qt Cherry-pick Bot
parent 76783a4487
commit aa0e38c607
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -527,7 +527,7 @@ function(qt6_add_big_resources outfiles )
COMMENT "Running rcc pass 1 for resource ${outfilename}" COMMENT "Running rcc pass 1 for resource ${outfilename}"
VERBATIM) VERBATIM)
add_custom_target(big_resources_${outfilename} ALL DEPENDS ${tmpoutfile}) 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( _qt_internal_add_rcc_pass2(
RESOURCE_NAME ${outfilename} RESOURCE_NAME ${outfilename}
RCC_OPTIONS ${rcc_options} RCC_OPTIONS ${rcc_options}

8
src/widgets/Qt6WidgetsMacros.cmake
View File

@ -31,12 +31,12 @@ function(qt6_wrap_ui outfiles )
ARGS ${ui_options} -o ${outfile} ${infile} ARGS ${ui_options} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile} VERBATIM) MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
_qt_internal_set_source_file_generated(
SOURCES ${outfile}
SKIP_AUTOGEN
)
list(APPEND ${outfiles} ${outfile}) list(APPEND ${outfiles} ${outfile})
endforeach() endforeach()
_qt_internal_set_source_file_generated(
SOURCES ${${outfiles}}
SKIP_AUTOGEN
)
set(${outfiles} ${${outfiles}} PARENT_SCOPE) set(${outfiles} ${${outfiles}} PARENT_SCOPE)
endfunction() endfunction()