summaryrefslogtreecommitdiffstats
path: root/cmake/QtResource.cmake.in
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-08-22 15:41:10 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-08-22 13:49:58 +0000
commit46603d655dbafbec20a599fb11fb9c81e34a26fe (patch)
treebccd606eae5d8a58e3bfbc1624335caf78d8d86a /cmake/QtResource.cmake.in
parent24bdc6e15633b582e857934d564ed8c70dbda59a (diff)
Replace invalid symbols with underscore
When building tests for android some resources names had the "#" character in them which triggered a CMake error when use in conjunction with add_custom_target() Change-Id: If5f471eebb027683e86b0c4e38c2f34ff8891b7a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtResource.cmake.in')
-rw-r--r--cmake/QtResource.cmake.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/QtResource.cmake.in b/cmake/QtResource.cmake.in
index cc396fc319..cd9f2aa393 100644
--- a/cmake/QtResource.cmake.in
+++ b/cmake/QtResource.cmake.in
@@ -89,6 +89,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})
+ string(REGEX REPLACE "[\$#\?]+" "_" compiled_file ${compiled_file})
set(compiled_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/${compiled_file}.cpp")
add_custom_command(
OUTPUT ${compiled_file}