summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-08-15 10:42:47 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-08-15 09:34:09 +0000
commit7fda42ef9ad1d4980c905ff4415124adf5d06966 (patch)
tree2b1472686922b28a599d58ce9d58735296fcc03d /cmake
parent8630c5ac7ef9db033f96adbd5dec363f9f2796b9 (diff)
Rename alias property on source files to QT_RESOURCE_ALIAS
Rename the alias property used by add_qt_resource() to QT_RESOURCE_ALIAS to match property naming conventions. Change-Id: I97b12b0b794e158f03dabeed5ec23a3b7d56cfbb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuild.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 8392ab46c7..d08c93771f 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2394,7 +2394,7 @@ function(qt_create_tracepoints name tracePointsFile)
endfunction()
function(qt_get_relative_resource_path_for_file output_alias file)
- get_property(alias SOURCE ${file} PROPERTY alias)
+ get_property(alias SOURCE ${file} PROPERTY QT_RESOURCE_ALIAS)
if (NOT alias)
set(alias "${file}")
endif()
@@ -2566,7 +2566,7 @@ function(add_qt_resource target resourceName)
# Unless otherwise specified, we should use the original file path
# as alias.
if (alias STREQUAL resource_file)
- set_source_files_properties(${resource_file} PROPERTIES alias ${file})
+ set_source_files_properties(${resource_file} PROPERTIES QT_RESOURCE_ALIAS ${file})
endif()
file(TO_CMAKE_PATH ${resource_file} resource_file)
list(APPEND resource_files ${resource_file})