qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <sami.varanka@qt.io>
(cherry picked from commit 6300f5af2f)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e486f98cbc)
This commit is contained in:
Alexey Edelev 2025-08-13 13:44:36 +02:00 committed by Sami Varanka
parent f950c42b54
commit 8d85655da9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies.yaml
View File

@ -7,4 +7,4 @@ dependencies:
required: true
../qtquick3d:
ref: 960a94263ae4362066125b611016415a1746fa28
required: true
required: false

3
tests/baseline/CMakeLists.txt
View File

@ -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)