qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge f76c3d42cc into c7b3cb5f2a

This commit is contained in:
K. R. Walker 2025-09-15 19:36:34 +00:00 committed by GitHub
parent c7b3cb5f2a f76c3d42cc
commit a684c0f34d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/Qt6CoreMacros.cmake
View File

@ -121,7 +121,7 @@ function(_qt_internal_create_moc_command infile outfile moc_flags moc_options
set(concatenated "$<FILTER:$<REMOVE_DUPLICATES:${concatenated}>,EXCLUDE,^-[DI]$>")
set(concatenated "$<JOIN:${concatenated},\n>")
file (GENERATE
file(GENERATE
OUTPUT ${_moc_parameters_file}
CONTENT "${concatenated}"
)
@ -134,10 +134,9 @@ function(_qt_internal_create_moc_command infile outfile moc_flags moc_options
file(WRITE ${_moc_parameters_file} "${_moc_parameters}\n")
endif()
set(_moc_extra_parameters_file @${_moc_parameters_file})
add_custom_command(OUTPUT ${outfile} ${extra_output_files}
COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${_moc_extra_parameters_file}
DEPENDS ${infile} ${moc_depends}
COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc @${_moc_parameters_file}
DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${moc_parameters_file} ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOMOC ON)