1 files changed, 15 insertions, 36 deletions
diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in
index f25d0bed43..bcbb9bb5db 100644
--- a/cmake/QtPluginDependencies.cmake.in
+++ b/cmake/QtPluginDependencies.cmake.in
@@ -1,42 +1,21 @@
-# note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;"
-set(_third_party_deps "@third_party_deps@")
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
-foreach(_target_dep ${_third_party_deps})
-    list(GET _target_dep 0 pkg)
-    list(GET _target_dep 1 version)
-    list(GET _target_dep 2 components)
-    set(find_package_args "${pkg}")
-    if(version)
-        list(APPEND find_package_args "${version}")
-    endif()
+set(@target@_FOUND FALSE)
 
-        if(components)
-            string(REPLACE " " ";" components "${components}")
-            find_dependency(${find_package_args} COMPONENTS ${components})
-        else()
-            find_dependency(${find_package_args})
-        endif()
+# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
+set(__qt_@target@_third_party_deps "@third_party_deps@")
+_qt_internal_find_third_party_dependencies("@target@" __qt_@target@_third_party_deps)
 
-    if (NOT ${pkg}_FOUND)
-        set(@target@_FOUND FALSE)
-        return()
-    endif()
-endforeach()
+set(__qt_use_no_default_path_for_qt_packages "NO_DEFAULT_PATH")
+if(QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES)
+    set(__qt_use_no_default_path_for_qt_packages "")
+endif()
 
 # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
-set(_target_deps "@target_deps@")
-foreach(_target_dep ${_target_deps})
-    list(GET _target_dep 0 pkg)
-    list(GET _target_dep 1 version)
+set(__qt_@target@_target_deps "@target_deps@")
+set(__qt_@target@_find_dependency_paths "@find_dependency_paths@")
+_qt_internal_find_qt_dependencies("@target@" __qt_@target@_target_deps
+                                  __qt_@target@_find_dependency_paths)
 
-    if (NOT ${pkg}_FOUND)
-        find_dependency(${pkg} ${version}
-            PATHS "${CMAKE_CURRENT_LIST_DIR}/.." ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH
-        )
-    endif()
-
-    if (NOT ${pkg}_FOUND)
-        set(@target@_FOUND FALSE)
-        return()
-    endif()
-endforeach()
+set(@target@_FOUND TRUE)