From 1b8603a077109e2f4d55b83e467394685fb0b10f Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 5 Mar 2025 12:39:00 +0100
Subject: [PATCH] Build: Avoid looking for *Private for Qt < 6.9.0

Amends eea2ba93ae89d0f44ad934c5ea13824a4b95f14c

Change-Id: I551e88fc843b2b33248dfdaf636491e324f77a57
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 CMakeLists.txt                                    |  1 +
 .../qmldesigner/libs/designercore/CMakeLists.txt  |  5 ++++-
 src/tools/qmlpuppet/CMakeLists.txt                | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fa007e5574..c9fc6b5e458 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,7 @@ if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0)
     DesignerComponentsPrivate
     QmlPrivate
     QuickPrivate
+    QUIET
   )
 endif()
 
diff --git a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
index 3f5f4040e4f..fbbcd219c5b 100644
--- a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
+++ b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
@@ -1,5 +1,8 @@
 if (IS_SUPPORTED_PROJECTSTORAGE_QT)
-  find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler QmlCompilerPrivate REQUIRED)
+  find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler REQUIRED)
+  if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0)
+    find_package(Qt6 COMPONENTS QmlCompilerPrivate REQUIRED)
+  endif()
 endif()
 
 add_qtc_library(QmlDesignerCore
diff --git a/src/tools/qmlpuppet/CMakeLists.txt b/src/tools/qmlpuppet/CMakeLists.txt
index 2a823798283..0d3f4bb7efc 100644
--- a/src/tools/qmlpuppet/CMakeLists.txt
+++ b/src/tools/qmlpuppet/CMakeLists.txt
@@ -96,7 +96,10 @@ extend_qtc_executable(qmlpuppet
     lookatgeometry.cpp lookatgeometry.h
 )
 
-find_package(Qt6 COMPONENTS Quick3DAssetImport Quick3DAssetImportPrivate QUIET)
+find_package(Qt6 COMPONENTS Quick3DAssetImport QUIET)
+if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0)
+  find_package(Qt6 COMPONENTS Quick3DAssetImportPrivate QUIET)
+endif()
 extend_qtc_executable(qmlpuppet
   CONDITION TARGET Qt::Quick3DAssetImportPrivate
   FEATURE_INFO "Qt Quick 3D asset import"
@@ -104,7 +107,10 @@ extend_qtc_executable(qmlpuppet
   DEFINES IMPORT_QUICK3D_ASSETS
 )
 
-find_package(Qt6 COMPONENTS Quick3DParticles Quick3DParticlesPrivate QUIET)
+find_package(Qt6 COMPONENTS Quick3DParticles QUIET)
+if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0)
+  find_package(Qt6 COMPONENTS Quick3DParticlesPrivate QUIET)
+endif()
 extend_qtc_executable(qmlpuppet
   CONDITION TARGET Qt::Quick3DParticles AND TARGET Qt::Quick3DParticlesPrivate
   FEATURE_INFO "Qt Quick 3D particles"
@@ -113,7 +119,10 @@ extend_qtc_executable(qmlpuppet
 )
 
 # Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work
-find_package(Qt6 COMPONENTS Quick3DAssetUtils QuickTimeline Quick3DAssetUtilsPrivate QUIET)
+find_package(Qt6 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET)
+if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0)
+  find_package(Qt6 COMPONENTS Quick3DAssetUtilsPrivate QUIET)
+endif()
 extend_qtc_executable(qmlpuppet
   CONDITION TARGET Qt::Quick3DAssetUtilsPrivate
   FEATURE_INFO "Qt Quick 3D asset utils"