From e26d2865a718cecd08233e84673c67c5ca3bc765 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Tue, 8 Dec 2020 16:24:15 +0100 Subject: Fix autotest config in cross-compiled prefix build qt-cmake-standalone-test would be looking for the config files under the target machine install prefix instead of under the staging prefix on the build host. Change-Id: I29850af6d8fe502f4944f689ec10539d17ccdcb9 Pick-to: 6.0 Reviewed-by: Alexandru Croitor --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmake/QtBuildInternals') diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 53c70533fb..477f5d21e9 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -421,7 +421,11 @@ function(qt_get_standalone_tests_confg_files_path out_var) # QT_CONFIG_INSTALL_DIR is relative in prefix builds. if(QT_WILL_INSTALL) - qt_path_join(path "${CMAKE_INSTALL_PREFIX}" "${path}") + if(DEFINED CMAKE_STAGING_PREFIX) + qt_path_join(path "${CMAKE_STAGING_PREFIX}" "${path}") + else() + qt_path_join(path "${CMAKE_INSTALL_PREFIX}" "${path}") + endif() endif() set("${out_var}" "${path}" PARENT_SCOPE) -- cgit v1.2.3