diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | coin/module_config.yaml | 12 | ||||
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | src/datavisualization/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/datavisualization/doc/qtdatavis3d.qdocconf | 7 | ||||
| -rw-r--r-- | src/datavisualization/doc/src/maintenance-phase.qdocinc | 6 | ||||
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-index.qdoc | 3 | ||||
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-overview.qdoc | 2 |
8 files changed, 30 insertions, 9 deletions
diff --git a/.cmake.conf b/.cmake.conf index dc1d7a92..6792234a 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 58c91b78..4542f8ef 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -6,8 +6,13 @@ accept_configuration: instructions: Build: - - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" - + - type: Group + instructions: + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + disable_if: + condition: property + property: configureArgs + contains_value: "-no-opengl" Test: - type: Group instructions: @@ -21,3 +26,6 @@ instructions: - condition: property property: configureArgs contains_value: "-no-widgets" + - condition: property + property: configureArgs + contains_value: "-no-opengl" diff --git a/dependencies.yaml b/dependencies.yaml index 9d5b866e..cee39521 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 0cd5eb895cc96126a495eb3d2d258be47eed193a + ref: 08c6de0c5d646a1c99834408ccd257f60f7624db required: true ../qtdeclarative: - ref: c63bb2bad5b4e741ed8a1e16d8f1f916c9baf61d + ref: 53b3a0d41545106fdd82cedc42393ff38d70f1fd required: false ../qtmultimedia: - ref: ceafdc0436e5ab3fccf64f0eb688bd0e0656fa7f + ref: 5068d292c20510876ea1fe9b50409384c55df263 required: false diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt index 27f82340..2dfcdb69 100644 --- a/src/datavisualization/CMakeLists.txt +++ b/src/datavisualization/CMakeLists.txt @@ -106,7 +106,6 @@ qt_internal_add_module(DataVisualization Qt::Core Qt::Gui Qt::OpenGL - GENERATE_CPP_EXPORTS ) set_source_files_properties("engine/meshes/arrowFlat.obj" diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf index 952cac3e..8f5034d0 100644 --- a/src/datavisualization/doc/qtdatavis3d.qdocconf +++ b/src/datavisualization/doc/qtdatavis3d.qdocconf @@ -16,7 +16,12 @@ exampledirs += ../../../examples/datavisualization \ imagedirs += ../images \ images -depends = qtcore qtgui qtqml qtquick qtdoc qtcmake qtwidgets +# Define a custom file name suffix for C++ types as Qt Graphs +# module declares identically-named, documented types. +outputsuffixes = CPP +outputsuffixes.CPP = -qtdatavis + +depends = qtcore qtgui qtqml qtquick qtdoc qtcmake qtwidgets qtgraphs qhp.projects = QtDataVis3D diff --git a/src/datavisualization/doc/src/maintenance-phase.qdocinc b/src/datavisualization/doc/src/maintenance-phase.qdocinc new file mode 100644 index 00000000..65cd17b0 --- /dev/null +++ b/src/datavisualization/doc/src/maintenance-phase.qdocinc @@ -0,0 +1,6 @@ +\note The Qt Data Visualization module is in the maintenance phase. For new +projects, consider using the \l {Qt Graphs} module. For 3D rendering, QtGraphs +uses QtQuick3D, which in turn uses QtRhi. QtRhi relies on each platform's native +rendering backend (Metal on macOS, DirectX on Windows, OpenGL or Vulkan on +Linux). To migrate from Qt Data Visualization to Qt Graphs module, refer to +\l {Qt Graphs Migration from Qt DataVisualization}. diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc index 5896b094..6af8f4e8 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc @@ -6,7 +6,6 @@ \page qtdatavisualization-index.html \brief Provides functionality for 3D visualization. - The Qt Data Visualization module enables you to visualize data in 3D as bar, scatter, and surface graphs. It's especially useful for visualizing depth maps and large quantities of rapidly changing data, such as data @@ -16,6 +15,8 @@ Qt Data Visualization is built on Qt 6 and OpenGL to take advantage of hardware acceleration and Qt Quick. + \include maintenance-phase.qdocinc + \section1 Using the Module \section2 QML API diff --git a/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc b/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc index 0bf83ec4..f6bbea48 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc @@ -31,6 +31,8 @@ and viewing 2D slices of the 3D data for increased readability. For more information, see \l{Qt Data Visualization Interacting with Data}. + \include maintenance-phase.qdocinc + \section1 Graph Types The Qt Data Visualization module provides the following 3D graph types: |