feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Build: Adapt to changed requirement for private target

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Eike Ziller
2025-03-03 18:51:00 +01:00
parent a2a373a3c6
commit eea2ba93ae
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -80,6 +80,17 @@ find_package(Qt6
find_package(Qt6 OPTIONAL_COMPONENTS Quick QuickWidgets Designer DesignerComponentsPrivate find_package(Qt6 OPTIONAL_COMPONENTS Quick QuickWidgets Designer DesignerComponentsPrivate
Help SerialPort Svg Tools LinguistTools QUIET) 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 # depending on Qt version and compiler version enable or disable Qml Designer
# can be overwritten by variable WITH_QMLDESIGNER / QTC_WITH_QMLDESIGNER (env) # can be overwritten by variable WITH_QMLDESIGNER / QTC_WITH_QMLDESIGNER (env)
configure_qml_designer(${Qt6_VERSION}) configure_qml_designer(${Qt6_VERSION})

2
src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
if (IS_SUPPORTED_PROJECTSTORAGE_QT) if (IS_SUPPORTED_PROJECTSTORAGE_QT)
find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler REQUIRED) find_package(Qt6 COMPONENTS QmlDomPrivate QmlCompiler QmlCompilerPrivate REQUIRED)
endif() endif()
add_qtc_library(QmlDesignerCore add_qtc_library(QmlDesignerCore

12
src/tools/qmlpuppet/CMakeLists.txt
View File

@@ -96,26 +96,26 @@ extend_qtc_executable(qmlpuppet
lookatgeometry.cpp lookatgeometry.h lookatgeometry.cpp lookatgeometry.h
) )
find_package(Qt6 COMPONENTS Quick3DAssetImport QUIET) find_package(Qt6 COMPONENTS Quick3DAssetImport Quick3DAssetImportPrivate QUIET)
extend_qtc_executable(qmlpuppet extend_qtc_executable(qmlpuppet
CONDITION TARGET Qt::Quick3DAssetImport CONDITION TARGET Qt::Quick3DAssetImportPrivate
FEATURE_INFO "Qt Quick 3D asset import" FEATURE_INFO "Qt Quick 3D asset import"
DEPENDS Qt::Quick3DAssetImportPrivate DEPENDS Qt::Quick3DAssetImportPrivate
DEFINES IMPORT_QUICK3D_ASSETS DEFINES IMPORT_QUICK3D_ASSETS
) )
find_package(Qt6 COMPONENTS Quick3DParticles QUIET) find_package(Qt6 COMPONENTS Quick3DParticles Quick3DParticlesPrivate QUIET)
extend_qtc_executable(qmlpuppet extend_qtc_executable(qmlpuppet
CONDITION TARGET Qt::Quick3DParticles CONDITION TARGET Qt::Quick3DParticles AND TARGET Qt::Quick3DParticlesPrivate
FEATURE_INFO "Qt Quick 3D particles" FEATURE_INFO "Qt Quick 3D particles"
DEPENDS Qt::Quick3DParticles Qt::Quick3DParticlesPrivate DEPENDS Qt::Quick3DParticles Qt::Quick3DParticlesPrivate
DEFINES QUICK3D_PARTICLES_MODULE DEFINES QUICK3D_PARTICLES_MODULE
) )
# Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work # 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 extend_qtc_executable(qmlpuppet
CONDITION TARGET Qt::Quick3DAssetUtils CONDITION TARGET Qt::Quick3DAssetUtilsPrivate
FEATURE_INFO "Qt Quick 3D asset utils" FEATURE_INFO "Qt Quick 3D asset utils"
DEPENDS Qt::Quick3DAssetUtilsPrivate DEPENDS Qt::Quick3DAssetUtilsPrivate
DEFINES QUICK3D_ASSET_UTILS_MODULE DEFINES QUICK3D_ASSET_UTILS_MODULE