From 8d85655da94c516bebfcbe1d6896903ad1c45fb4 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 13 Aug 2025 13:44:36 +0200 Subject: [PATCH] Make 'qtquick3d' optional dependency for the module QtQuick3D was listed as a required module in dependencies. However, you should be able to build QtGraphs without 3D features. In that case, it is not necessary to have Quick3D. Therefore, the Quick3D required field should be false in the dependencies. In addition, the baseline tests must be turned off if 3D features are unavailable, as they link to Quick3D. Pick-to: 6.8 Change-Id: I6c45fde93d75d54b4adf89471441d989452b0245 Reviewed-by: Sami Varanka (cherry picked from commit 6300f5af2f58669306531a41e07c80560bbb6abb) Reviewed-by: Volker Hilsheimer (cherry picked from commit e486f98cbcb0b5aeccca0982b1d20e71c7592965) --- dependencies.yaml | 2 +- tests/baseline/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index fccf9b26..c5955877 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -7,4 +7,4 @@ dependencies: required: true ../qtquick3d: ref: 960a94263ae4362066125b611016415a1746fa28 - required: true + required: false diff --git a/tests/baseline/CMakeLists.txt b/tests/baseline/CMakeLists.txt index 6b76b56c..1fa01483 100644 --- a/tests/baseline/CMakeLists.txt +++ b/tests/baseline/CMakeLists.txt @@ -8,7 +8,8 @@ if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) endif() # Special case: test includes the QBaselineTest module sources from qtbase directly -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../qtbase/tests/baseline/shared") +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../qtbase/tests/baseline/shared" + AND TARGET Qt6::Quick3D) add_subdirectory(scenegrabber) if (QT_FEATURE_process) add_subdirectory(graphs)