pro2cmake: Write only one find_package call for Qt packages

Task-number: QTBUG-96799
Change-Id: I1eb8ac05f360b74e5ae1217b5535a33227b5084b
Reviewed-by: Alexandru Croitor <[email protected]>

1 files changed, 18 insertions, 2 deletions

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 93e6e6efa67..46aa3dc6f63 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -3741,9 +3741,25 @@ def write_find_package_section(
         if info and info not in packages:
             packages.append(info)
 
-    # ind = spaces(indent)
+    qt_components: List[str] = []
+    for p in filter(LibraryMapping.is_qt, packages):
+        if p.components is not None:
+            qt_components += p.components
+    if qt_components:
+        qt_components = sorted(qt_components)
+        qt_package = LibraryMapping(
+            "unknown", "Qt6", "unknown", extra=["REQUIRED"], components=qt_components
+        )
+        cm_fh.write(
+            generate_find_package_info(
+                qt_package,
+                use_qt_find_package=False,
+                remove_REQUIRED_from_extra=False,
+                indent=indent,
+            )
+        )
 
-    for p in packages:
+    for p in itertools.filterfalse(LibraryMapping.is_qt, packages):
         cm_fh.write(generate_find_package_info(p, use_qt_find_package=False, indent=indent))
 
     if packages: