From eea2ba93ae89d0f44ad934c5ea13824a4b95f14c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 3 Mar 2025 18:51:00 +0100 Subject: [PATCH] Build: Adapt to changed requirement for private target Qt 6.9 moved FooPrivate targets to their own CMake packages and makes it mandatory to find_package them separately. Fixes: QTCREATORBUG-32564 Task-number: QTBUG-87776 Change-Id: Iff828182a7e220868b962e8521c985f4b0be405a Reviewed-by: Alexandru Croitor --- CMakeLists.txt | 11 +++++++++++ .../qmldesigner/libs/designercore/CMakeLists.txt | 2 +- src/tools/qmlpuppet/CMakeLists.txt | 12 ++++++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 224ff3b6de3..2fa007e5574 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,17 @@ find_package(Qt6 find_package(Qt6 OPTIONAL_COMPONENTS Quick QuickWidgets Designer DesignerComponentsPrivate Help SerialPort Svg Tools LinguistTools QUIET) +if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0) + find_package(Qt6 OPTIONAL_COMPONENTS + CorePrivate + Core5CompatPrivate + GuiPrivate + DesignerComponentsPrivate + QmlPrivate + QuickPrivate + ) +endif() + # depending on Qt version and compiler version enable or disable Qml Designer # can be overwritten by variable WITH_QMLDESIGNER / QTC_WITH_QMLDESIGNER (env) configure_qml_designer(${Qt6_VERSION}) diff --git a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt index 5d5e5d7a4b5..3f5f4040e4f 100644 --- a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt +++ b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt @@ -1,5 +1,5 @@ if (IS_SUPPORTED_PROJECTSTORAGE_QT) - find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler REQUIRED) + find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler QmlCompilerPrivate REQUIRED) endif() add_qtc_library(QmlDesignerCore diff --git a/src/tools/qmlpuppet/CMakeLists.txt b/src/tools/qmlpuppet/CMakeLists.txt index ffad8a01fae..2a823798283 100644 --- a/src/tools/qmlpuppet/CMakeLists.txt +++ b/src/tools/qmlpuppet/CMakeLists.txt @@ -96,26 +96,26 @@ extend_qtc_executable(qmlpuppet lookatgeometry.cpp lookatgeometry.h ) -find_package(Qt6 COMPONENTS Quick3DAssetImport QUIET) +find_package(Qt6 COMPONENTS Quick3DAssetImport Quick3DAssetImportPrivate QUIET) extend_qtc_executable(qmlpuppet - CONDITION TARGET Qt::Quick3DAssetImport + CONDITION TARGET Qt::Quick3DAssetImportPrivate FEATURE_INFO "Qt Quick 3D asset import" DEPENDS Qt::Quick3DAssetImportPrivate DEFINES IMPORT_QUICK3D_ASSETS ) -find_package(Qt6 COMPONENTS Quick3DParticles QUIET) +find_package(Qt6 COMPONENTS Quick3DParticles Quick3DParticlesPrivate QUIET) extend_qtc_executable(qmlpuppet - CONDITION TARGET Qt::Quick3DParticles + CONDITION TARGET Qt::Quick3DParticles AND TARGET Qt::Quick3DParticlesPrivate FEATURE_INFO "Qt Quick 3D particles" DEPENDS Qt::Quick3DParticles Qt::Quick3DParticlesPrivate DEFINES QUICK3D_PARTICLES_MODULE ) # Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work -find_package(Qt6 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET) +find_package(Qt6 COMPONENTS Quick3DAssetUtils QuickTimeline Quick3DAssetUtilsPrivate QUIET) extend_qtc_executable(qmlpuppet - CONDITION TARGET Qt::Quick3DAssetUtils + CONDITION TARGET Qt::Quick3DAssetUtilsPrivate FEATURE_INFO "Qt Quick 3D asset utils" DEPENDS Qt::Quick3DAssetUtilsPrivate DEFINES QUICK3D_ASSET_UTILS_MODULE