diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:18:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:37:04 +0100 |
| commit | 8ec2403603f82e7a0d43b4de04c97ef1c7f1ad35 (patch) | |
| tree | d7099d5a7cf813f378064ef0348647f4e68b2692 /tools/qmlcachegen | |
| parent | 15525d2a309a6028d548797bc777e38905f36c46 (diff) | |
| parent | 454676a8745a7334539449562a5fda47db2fc2ca (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.cpp
src/qml/compiler/qv4instr_moth.cpp
src/quick/handlers/qquicksinglepointhandler_p.h
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/context2d/qquickcontext2d.cpp
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I109453131f9f0a05316ae37c7d6ed1edc8c0f9d4
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in index a5c531fb0d..75fbb0fcf3 100644 --- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in +++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in @@ -61,16 +61,18 @@ but not all the files it references. set(rcc_file_with_compilation_units) execute_process(COMMAND ${rcc_path} -list \"${input_resource}\" OUTPUT_VARIABLE rcc_contents) - string(REGEX REPLACE \"[\r\n]+\" \";\" rcc_contents ${rcc_contents}) - foreach(it ${rcc_contents}) - 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}) - list(APPEND compiler_output ${output_file}) - set(rcc_file_with_compilation_units ${input_resource}) - endif() - endforeach() + if (NOT rcc_contents STREQUAL \"\") + string(REGEX REPLACE \"[\r\n]+\" \";\" rcc_contents ${rcc_contents}) + foreach(it ${rcc_contents}) + 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}) + list(APPEND compiler_output ${output_file}) + set(rcc_file_with_compilation_units ${input_resource}) + endif() + endforeach() + endif() if(rcc_file_with_compilation_units) list(APPEND rcc_files_with_compilation_units ${rcc_file_with_compilation_units}) |