From c8621da85265ecec8968eb54bfaa1558474f241b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 26 Jan 2022 14:33:31 +0100 Subject: CMake: Fix host UiTools being picked up instead of target one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.2 6.3 Fixes: QTBUG-100233 Change-Id: Id4b30841ba9e499f462325f882218edf407e0a00 Reviewed-by: Jörg Bornemann --- cmake/QtConfig.cmake.in | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake/QtConfig.cmake.in') diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index 93f3f5246c..752655c21e 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -134,6 +134,7 @@ endif() foreach(module ${@INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS}) if(NOT "${QT_HOST_PATH}" STREQUAL "" AND "${module}" MATCHES "Tools$" + AND NOT "${module}" MATCHES "UiTools$" AND NOT "${module}" MATCHES "ShaderTools$" AND NOT "${module}" MATCHES "^Tools$" AND NOT QT_NO_FIND_HOST_TOOLS_PATH_MANIPULATION) -- cgit v1.2.3