From 077ea818af28d6815676f3bc88312c8d9219deaf Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 18 Oct 2019 09:46:23 +0200 Subject: [PATCH] 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 --- cmake/QtBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 48d755450f9..a3b92d620b3 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})