From b25260bac692c2d94cacbf513419c06ac54154e2 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 12 Aug 2019 10:43:05 +0200 Subject: Change quick compiler generated code path We now compile all qml files from the quick compiler in separate directories qmlcache/${resource_name} to prevent issues where the same qml file is present in more than one resource file. Change-Id: I6857ff6aaaa21112896d5d39bbe11d3ffe524ec8 Reviewed-by: Simon Hausmann --- cmake/QtBuild.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 490df89289..852ec0ace9 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2456,7 +2456,7 @@ function(qt_quick_compiler_process_resources target resource_name) string(REGEX REPLACE "\.js$" "_js" compiled_file ${file_relative}) string(REGEX REPLACE "\.mjs$" "_mjs" compiled_file ${compiled_file}) string(REGEX REPLACE "\.qml$" "_qml" compiled_file ${compiled_file}) - set(compiled_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${compiled_file}.cpp") + set(compiled_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/${compiled_file}.cpp") add_custom_command( OUTPUT ${compiled_file} DEPENDS ${file_absolute} @@ -2469,13 +2469,13 @@ function(qt_quick_compiler_process_resources target resource_name) target_sources(${target} PRIVATE ${compiled_file}) endforeach() - set(qmlcache_loader_list "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}_qml_loader_file_list.rsp") + set(qmlcache_loader_list "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/qml_loader_file_list.rsp") file(GENERATE OUTPUT ${qmlcache_loader_list} CONTENT "$" ) - set(qmlcache_loader_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}_qmlcache_loader.cpp") + set(qmlcache_loader_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/qmlcache_loader.cpp") set(resource_name_arg "${resource_name}.qrc") if (chained_resource_name) set(resource_name_arg "${resource_name_arg}=${chained_resource_name}") -- cgit v1.2.3