From c29d4e09a2ddd8a9c0fac9402fb3b7875af83ad9 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 18 Jun 2021 09:37:44 +0200
Subject: [PATCH] CMake build/Qt6.2: Avoid message about missing
 DesignerComponents

Amends 77fd87a545e2c3374b252603ad9da6e029f42f99

Change-Id: I237a3f0b146f9fe5e2db1e1e4eb943a90fbd8db8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 cmake/FindQt5.cmake | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmake/FindQt5.cmake b/cmake/FindQt5.cmake
index e30ee54c14e..831ea046a06 100644
--- a/cmake/FindQt5.cmake
+++ b/cmake/FindQt5.cmake
@@ -42,11 +42,16 @@ if (NOT Qt6_FOUND)
   endif()
   return()
 else()
-  # since Qt 6.2 DesignerComponents is called private
-  find_package(Qt6DesignerComponentsPrivate CONFIG QUIET)
-  if (TARGET Qt6::DesignerComponentsPrivate)
-    add_library(Qt5::DesignerComponents ALIAS Qt6::DesignerComponentsPrivate)
+  # since Qt 6.2 DesignerComponents is called DesignerComponentsPrivate
+  list(FIND Qt5_FIND_COMPONENTS DesignerComponents dcIndex)
+  if(dcIndex GREATER_EQUAL 0)
+    find_package(Qt6DesignerComponentsPrivate CONFIG QUIET)
+    if(TARGET Qt6::DesignerComponentsPrivate)
+      add_library(Qt5::DesignerComponents ALIAS Qt6::DesignerComponentsPrivate)
+      list(REMOVE_AT Qt5_FIND_COMPONENTS ${dcIndex})
+    endif()
   endif()
+
   find_package(Qt6 CONFIG ${__arguments} ${Qt5_FIND_COMPONENTS})
 endif()