summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-10-18 09:46:23 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-10-18 13:20:56 +0000
commit077ea818af28d6815676f3bc88312c8d9219deaf (patch)
tree43a02907630ea7e253e43e518b8b55dba2284acc
parent373be4200b162ae9b2244d7019770911bc73317a (diff)
Rename builtin test data resource name
Rename the builtin test data resource name to something more unique as there are name clashes when building tests which also add a resource named 'testdata'. Change-Id: Icc1bbff3134e1dbc6ea4f6a87a1715b936c723cc Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--cmake/QtBuild.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 48d755450f..a3b92d620b 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2445,7 +2445,7 @@ function(add_qt_test name)
endforeach()
if (builtin_files)
- add_qt_resource(${name} "testdata"
+ add_qt_resource(${name} "${name}_testdata_builtin"
PREFIX "/"
FILES ${builtin_files}
BASE ${CMAKE_CURRENT_SOURCE_DIR})