Fix example naming and categories

Remove 2 more irrelevant examples

Pick-to: 6.5
Fixes: QTBUG-110463
Change-Id: I9597f311d36fb79db45f6f64fb97bc5376372980
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

7 files changed, 20 insertions, 20 deletions

diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
index a81dbd16..5896b094 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
@@ -14,7 +14,7 @@
     customized by using themes or by adding custom items and labels.
 
     Qt Data Visualization is built on Qt 6 and OpenGL to take advantage of
-    hardware acceleration and Qt Quick 2.
+    hardware acceleration and Qt Quick.
 
     \section1 Using the Module
 
diff --git a/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc b/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc
index ff08fb6b..3db3a8f7 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc
@@ -56,7 +56,7 @@
     \image q3dbars-minimal.png
 
     For more information, see \l{How to construct a minimal Q3DBars graph},
-    \l {Bars Example}, and \l {Qt Quick 2 Bars Example}.
+    \l {Bar Graph}, and \l {Simple Bar Graph} examples.
 
     \section2 3D Scatter Graphs
 
@@ -69,7 +69,7 @@
     \image q3dscatter-minimal.png
 
     For more information, see \l{How to construct a minimal Q3DScatter graph},
-    \l{Scatter Example}, and \l{Qt Quick 2 Scatter Example}.
+    \l{Scatter Graph}, and \l{Simple Scatter Graph} examples.
 
     \section2 3D Surface Graphs
 
@@ -82,8 +82,7 @@
     \image q3dsurface-minimal.png
 
     For more information, see \l{How to construct a minimal Q3DSurface graph},
-    \l{Surface Example}, \l{Textured Surface Example}, \l{Qt Quick 2 Surface
-    Example}, and \l{Qt Quick 2 Surface Multiseries Example}.
+    \l{Surface Graph}, \l{Textured Surface Graph}, and \l{Surface Graph from Height Data} examples.
 
     \section1 Using OpenGL for Rendering Data
 
@@ -114,7 +113,7 @@
     be partially transparent. Therefore, changing the rendering mode is a
     question of performance versus quality.
 
-    Qt Quick 2 uses a dedicated scenegraph for data rendering, and is therefore
+    Qt Quick uses a dedicated scenegraph for data rendering, and is therefore
     the best choice for data visualization.
 
     \section1 3D Axes
@@ -187,7 +186,7 @@
     If a graph displays the data from several data series, some settings can be
     specified separately for each series. For example, different gradients can
     be specified for different layers of the graph to make it look more
-    realistic. For an example, see \l{Qt Quick 2 Surface Multiseries Example}.
+    realistic. For an example, see \l{Custom Items in Graph}.
 
     \section1 Customizing 3D Scenes
 
@@ -199,7 +198,7 @@
     position follows the camera automatically.
 
     The camera can be customized by specifying its preset position, rotation,
-    and zoom level. For an example, see \l{Qt Quick 2  Scatter Example}.
+    and zoom level. For an example, see \l{Simple Scatter Graph}.
 
     \section1 Customizing Items
 
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
index 8abf4ed2..922a9c03 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
@@ -284,7 +284,7 @@
  * \c selectedElementChanged signal is emitted.
  *
  * The signal can be used for example for implementing customized input
- * handling, as demonstrated by the \l {Qt Quick 2 Axis Dragging Example}.
+ * handling, as demonstrated by the \l {Axis Dragging} example.
  *
  * \sa selectedLabelIndex(), selectedAxis(), selectedCustomItemIndex(), selectedCustomItem(),
  * Bars3D::selectedSeries, Scatter3D::selectedSeries, Scene3D::selectionQueryPosition,
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
index f428524e..5116aa3a 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
@@ -9,7 +9,7 @@
  * \ingroup datavisualization_qml
  * \brief 3D bar graph.
  *
- * This type enables developers to render bar graphs in 3D with Qt Quick 2.
+ * This type enables developers to render bar graphs in 3D with Qt Quick.
  *
  * You will need to import data visualization module to use this type:
  *
@@ -19,7 +19,7 @@
  *
  * \snippet doc_src_qmldatavisualization.cpp 1
  *
- * See \l{Qt Quick 2 Bars Example} for more thorough usage example.
+ * See \l{Simple Bar Graph} for more thorough usage example.
  *
  * \sa Bar3DSeries, ItemModelBarDataProxy, Scatter3D, Surface3D, {Qt Data Visualization C++ Classes}
  */
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
index 5088e1ca..8e43ea79 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
@@ -9,7 +9,7 @@
   \ingroup datavisualization_qml
   \brief 3D scatter graph.
 
-  This type enables developers to render scatter graphs in 3D with Qt Quick 2.
+  This type enables developers to render scatter graphs in 3D with Qt Quick.
 
   You will need to import data visualization module to use this type:
 
@@ -19,7 +19,7 @@
 
   \snippet doc_src_qmldatavisualization.cpp 2
 
-  See \l{Qt Quick 2 Scatter Example} for more thorough usage example.
+  See \l{Simple Scatter Graph} for more thorough usage example.
 
   \sa Scatter3DSeries, ScatterDataProxy, Bars3D, Surface3D, {Qt Data Visualization C++ Classes}
  */
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
index 682a4ccb..438d6163 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
@@ -9,7 +9,7 @@
   \ingroup datavisualization_qml
   \brief Describes the usage of the 3D surface graph.
 
-  This type enables developers to render surface plots in 3D with Qt Quick 2.
+  This type enables developers to render surface plots in 3D with Qt Quick.
 
   You will need to import the data visualization module to use this type:
 
@@ -19,7 +19,7 @@
 
   \snippet doc_src_qmldatavisualization.cpp 3
 
-  See \l{Qt Quick 2 Surface Example} for more thorough usage example.
+  See \l{Surface Graph from Height Data} for more thorough usage example.
 
   \sa Surface3DSeries, ItemModelSurfaceDataProxy, Bars3D, Scatter3D, {Qt Data Visualization C++ Classes}
  */
diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index 7a4e6886..ea5b2047 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -37,6 +37,8 @@
     \section1 Examples
 
     \annotatedlist qtdatavisualization_examples
+    The following examples show how to use Qt Quick to visualize data:
+    \annotatedlist qtdatavisualization_qmlexamples
 */
 
 /*!
@@ -111,7 +113,7 @@
     QHeightMapSurfaceDataProxy is a specialized proxy for generating a surface graph from a
     heightmap image. See the QHeightMapSurfaceDataProxy documentation for more information.
 
-    The \l{Custom Proxy Example}{Custom Proxy} example shows how a custom proxy can be created. It
+    The \l{Data from Custom Proxy}{Custom Proxy} example shows how a custom proxy can be created. It
     defines a custom data set based on variant lists and an extension of the basic proxy to resolve
     that data with an associated mapper.
 
@@ -161,9 +163,8 @@
     the default touch controls, see QTouch3DInputHandler. The default handlers
     must be disabled when using customized input handlers.
 
-    The \l{Custom Input Example} illustrates how to use a custom input handler
-    to select items upon mouseover instead of mouse click. The information
-    below the mouse cursor is displayed as a popup.
+    The \l{Input Handling for Axes} illustrates how to use a custom input handler
+    to drag an axis label to move the visible part of the data.
 
     In addition to perspective projection, orthographic projection can be used
     to create 2D graphs by replacing the default input handler with one that
@@ -200,7 +201,7 @@
             application main. It can be defined by adding \c {qputenv("QSG_RHI_BACKEND", "opengl");}
             in the beginning of your main function.
         \li Some platforms like Android and WinRT cannot handle multiple native windows properly,
-            so only the Qt Quick 2 graphs are available in practice for those platforms.
+            so only the Qt Quick graphs are available in practice for those platforms.
         \li Surfaces with non-straight rows and columns do not always render properly.
         \li Q3DLight class (and Light3D QML item) are currently not usable for anything.
         \li Changing most of Q3DScene properties affecting subviewports currently has no effect.