6 files changed, 20 insertions, 6 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/dependencies.yaml b/dependencies.yaml
index 44ac078c..7266301a 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
 dependencies:
   ../qtbase:
-    ref: 71bbc35a3774ba7411970ff74068f5211b73e425
+    ref: 2d72757875c913939909a1a36fcb123a1e26ac26
     required: true
   ../qtdeclarative:
-    ref: 3f3787a6b4f54f2603598e49eeebb58532aa2afa
+    ref: 5ca788a7a2bede98c9c75ce1068fa32fd63478cf
     required: false
   ../qtmultimedia:
-    ref: 3159dc9b5586ad08dc8c06b78257abeb319c71f9
+    ref: eefff29f778aa5bec8c52de10058767360c99957
     required: false
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: