whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor variable naming cleanup 

Change-Id: I47f07a22c356ca545052f63788756068a51c3e39
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Simon Hausmann 2019-08-09 09:39:42 +02:00
parent 9c3af6ecb2
commit 587581963e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtBuild.cmake
View File

@ -2453,8 +2453,8 @@ function(qt_quick_compiler_process_resources target resource_name)
foreach(file IN LISTS qml_files)
get_filename_component(file_absolute ${file} ABSOLUTE)
file(RELATIVE_PATH file_relative ${CMAKE_CURRENT_SOURCE_DIR} ${file_absolute})
qt_get_relative_resource_path_for_file(alias ${file})
set(file_resource_path "${arg_PREFIX}/${alias}")
qt_get_relative_resource_path_for_file(file_resource_path ${file})
set(file_resource_path "${arg_PREFIX}/${file_resource_path}")
file(TO_CMAKE_PATH ${file_resource_path} file_resource_path)
list(APPEND file_resource_paths ${file_resource_path})
string(REGEX REPLACE "\.js$" "_js" compiled_file ${file_relative})
@ -2577,7 +2577,7 @@ function(add_qt_resource target resourceName)
string(APPEND qrcContents ">\n")
foreach(file IN LISTS resources)
qt_get_relative_resource_path_for_file(alias ${file})
qt_get_relative_resource_path_for_file(file_resource_path ${file})
if (NOT IS_ABSOLUTE ${file})
set(file "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
@ -2585,7 +2585,7 @@ function(add_qt_resource target resourceName)
### FIXME: escape file paths to be XML conform
# <file ...>...</file>
string(APPEND qrcContents " <file alias=\"${alias}\">")
string(APPEND qrcContents " <file alias=\"${file_resource_path}\">")
string(APPEND qrcContents "${file}</file>\n")
list(APPEND files "${file}")
endforeach()