aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-07-03 15:11:26 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-07-03 15:27:38 +0200
commitdd9e41d1a5138fd58759c847525de7453efd2f00 (patch)
tree4d47a9a0242e2749e80e22bdaad132e333034a50
parent89861ad24970e71ac79a296406fe0fd757139fab (diff)
QtQuickCompiler: list rcc file as dependency of generated files
Otherwise the resources will not be re-processed if something is added or removed to/from the .rcc file. This does not affect Qt6 as there all QML files are automatically compiled and qtquick_compiler_add_resources does not exist anymore. Fixes: QTBUG-85190 Change-Id: Iadae47900e0213acfbf241a29307f2d40bcfe7f9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
index be2113b258..7209f1ae19 100644
--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
+++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
@@ -63,7 +63,10 @@ but not all the files it references.
get_filename_component(extension ${it} EXT)
if(extension STREQUAL \".qml\" OR extension STREQUAL \".js\" OR extension STREQUAL \".ui.qml\" OR extension STREQUAL \".mjs\")
qtquick_compiler_determine_output_filename(output_file ${it})
- add_custom_command(OUTPUT ${output_file} COMMAND ${compiler_path} ARGS --resource=${input_resource} ${it} -o ${output_file} DEPENDS ${it})
+ add_custom_command(OUTPUT ${output_file}
+ COMMAND ${compiler_path}
+ ARGS --resource=${input_resource} ${it} -o ${output_file}
+ DEPENDS ${it} ${input_resource})
list(APPEND compiler_output ${output_file})
set(rcc_file_with_compilation_units ${input_resource})
endif()