From 60c87c68016c6f02b0eddd4002f75a49ab51d4a8 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 7 May 2021 17:10:29 +0300
Subject: [PATCH] CMake: use additional search paths also for tool package

Use paths configured with QT_ADDITIONAL_PACKAGES_PREFIX_PATH
to search also for the tool packages.

Task-number: QTBUG-93565
Pick-to: 6.1
Change-Id: I611b275dd7c4e7ecceb073d16643cd225bbb21d8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtModuleDependencies.cmake.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
index f9a5897676b..5ec9345209e 100644
--- a/cmake/QtModuleDependencies.cmake.in
+++ b/cmake/QtModuleDependencies.cmake.in
@@ -63,7 +63,11 @@ foreach(_target_dep ${_tool_deps})
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
         list(APPEND find_package_args REQUIRED)
     endif()
-    find_package(${pkg} ${version} ${find_package_args})
+    find_package(${pkg} ${version} ${find_package_args}
+        PATHS
+            ${_qt_additional_packages_prefix_path}
+            ${_qt_additional_packages_prefix_path_env}
+    )
     if (NOT ${pkg}_FOUND)
         if(NOT "${QT_HOST_PATH}" STREQUAL "")
              set(CMAKE_PREFIX_PATH ${BACKUP_@target@_CMAKE_PREFIX_PATH})