From 4572ded8b32ea8883a0414f0cd65b9634feb5b5b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 12 Aug 2019 16:29:58 +0200 Subject: [PATCH] Fix copying / installing of testdata to proper location I don't know why, but previously the test data was copied to "test_build_dir/testdata" subfolder. That's incorrect, there's no need for a testdata subfolder, the copied / installed contents should go directly under the test build dir / install dir. Incidentally this will make the corelib/io/qdir tests to pass. Amends 1307736c7db1ff24e3b8282f4a7b14d24866feba . Change-Id: I9e180d608433fe82f4a29afea7f594507e6020d3 Reviewed-by: Leander Beernaert 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 cf9a9a90cca..3aa0c30268c 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2239,7 +2239,7 @@ function(add_qt_test name) "${QT_TOP_LEVEL_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") qt_path_join(testdata_install_dir ${QT_INSTALL_DIR} - "${relative_path_to_test_project}/testdata") + "${relative_path_to_test_project}") foreach(testdata IN LISTS arg_TESTDATA) set(testdata "${CMAKE_CURRENT_SOURCE_DIR}/${testdata}") if (IS_DIRECTORY "${testdata}")