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

Build: Avoid looking for *Private for Qt < 6.9.0

Browse Source 
Amends eea2ba93ae

Change-Id: I551e88fc843b2b33248dfdaf636491e324f77a57
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Eike Ziller
2025-03-05 12:39:00 +01:00
parent b9d952acba
commit 1b8603a077
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -88,6 +88,7 @@ if (QT_VERSION VERSION_GREATER_EQUAL 6.9.0)
DesignerComponentsPrivate DesignerComponentsPrivate
QmlPrivate QmlPrivate
QuickPrivate QuickPrivate
QUIET
) )
endif() endif()

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

@@ -1,5 +1,8 @@
if (IS_SUPPORTED_PROJECTSTORAGE_QT) 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() endif()
add_qtc_library(QmlDesignerCore add_qtc_library(QmlDesignerCore

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

@@ -96,7 +96,10 @@ extend_qtc_executable(qmlpuppet
lookatgeometry.cpp lookatgeometry.h 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 extend_qtc_executable(qmlpuppet
CONDITION TARGET Qt::Quick3DAssetImportPrivate CONDITION TARGET Qt::Quick3DAssetImportPrivate
FEATURE_INFO "Qt Quick 3D asset import" FEATURE_INFO "Qt Quick 3D asset import"
@@ -104,7 +107,10 @@ extend_qtc_executable(qmlpuppet
DEFINES IMPORT_QUICK3D_ASSETS 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 extend_qtc_executable(qmlpuppet
CONDITION TARGET Qt::Quick3DParticles AND TARGET Qt::Quick3DParticlesPrivate CONDITION TARGET Qt::Quick3DParticles AND TARGET Qt::Quick3DParticlesPrivate
FEATURE_INFO "Qt Quick 3D particles" 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 # 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 extend_qtc_executable(qmlpuppet
CONDITION TARGET Qt::Quick3DAssetUtilsPrivate CONDITION TARGET Qt::Quick3DAssetUtilsPrivate
FEATURE_INFO "Qt Quick 3D asset utils" FEATURE_INFO "Qt Quick 3D asset utils"