summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/advancedcustommaterial/doc/src/advancedcustommaterial.qdoc2
-rw-r--r--examples/qt3d/pbr-materials/doc/src/materials.qdoc2
-rw-r--r--examples/qt3d/planets-qml/images/nasa/qt_attribution.json1
-rw-r--r--examples/qt3d/scene3d/doc/src/scene3d.qdoc2
-rw-r--r--examples/qt3d/simplecustommaterial/doc/src/simplecustommaterial.qdoc8
5 files changed, 8 insertions, 7 deletions
diff --git a/examples/qt3d/advancedcustommaterial/doc/src/advancedcustommaterial.qdoc b/examples/qt3d/advancedcustommaterial/doc/src/advancedcustommaterial.qdoc
index eeb59f07b..0f8a95dab 100644
--- a/examples/qt3d/advancedcustommaterial/doc/src/advancedcustommaterial.qdoc
+++ b/examples/qt3d/advancedcustommaterial/doc/src/advancedcustommaterial.qdoc
@@ -27,7 +27,7 @@
/*!
\example advancedcustommaterial
- \title Qt 3D: Advanced custom material QML Example
+ \title Qt 3D: Advanced Custom Material QML Example
\ingroup qt3d-examples-qml
\brief Demonstrates creating advanced materials in Qt3D
diff --git a/examples/qt3d/pbr-materials/doc/src/materials.qdoc b/examples/qt3d/pbr-materials/doc/src/materials.qdoc
index c96bb0843..7a0e5d9a4 100644
--- a/examples/qt3d/pbr-materials/doc/src/materials.qdoc
+++ b/examples/qt3d/pbr-materials/doc/src/materials.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example materials
+ \example pbr-materials
\title Qt 3D: PBR Materials QML Example
\ingroup qt3d-examples-qml
\brief A QML application that demonstrates using PBR materials.
diff --git a/examples/qt3d/planets-qml/images/nasa/qt_attribution.json b/examples/qt3d/planets-qml/images/nasa/qt_attribution.json
index 174e092ef..400c405fb 100644
--- a/examples/qt3d/planets-qml/images/nasa/qt_attribution.json
+++ b/examples/qt3d/planets-qml/images/nasa/qt_attribution.json
@@ -2,6 +2,7 @@
"Id": "nasa-jpl",
"Name": "Jet Propulsion Laboratory Photojournal",
"QDocModule": "qt3d",
+ "QtParts": ["examples"],
"Description": "The NASA/JPL Photojournal provides high quality images related to space research and exploration",
"QtUsage": "Used in Qt 3D planets-qml example.",
diff --git a/examples/qt3d/scene3d/doc/src/scene3d.qdoc b/examples/qt3d/scene3d/doc/src/scene3d.qdoc
index fd324e6a4..c6deb6546 100644
--- a/examples/qt3d/scene3d/doc/src/scene3d.qdoc
+++ b/examples/qt3d/scene3d/doc/src/scene3d.qdoc
@@ -33,7 +33,7 @@
\image scene3d.png
- \e {Scene3D} demonstrates visualizing a 3D scene from a Qt Quick
+ This example demonstrates visualizing a 3D scene from a Qt Quick
application. The 3D scene contains a single active camera and a single
active light source. Visualized data is assumed to be at a fixed location.
diff --git a/examples/qt3d/simplecustommaterial/doc/src/simplecustommaterial.qdoc b/examples/qt3d/simplecustommaterial/doc/src/simplecustommaterial.qdoc
index 678a8f2d7..d10927d39 100644
--- a/examples/qt3d/simplecustommaterial/doc/src/simplecustommaterial.qdoc
+++ b/examples/qt3d/simplecustommaterial/doc/src/simplecustommaterial.qdoc
@@ -27,9 +27,9 @@
/*!
\example simplecustommaterial
- \title Qt 3D: Simple custom material QML Example
+ \title Qt 3D: Simple Custom Material QML Example
\ingroup qt3d-examples-qml
- \brief Demonstrates creating a custom material in Qt3D
+ \brief Demonstrates creating a custom material in Qt 3D.
\image simple-custom-material.jpg
@@ -37,7 +37,7 @@
\include examples-run.qdocinc
- \section1 Specifying the scene
+ \section1 Specifying the Scene
The example uses \l Scene3D to render a scene which will use the custom material.
The scene contains a plane model, which uses the custom material.
@@ -46,7 +46,7 @@
\skipto Entity
\printto
- \section1 Specifying the material
+ \section1 Specifying the Material
The material is specified in \l{simplecustommaterial/SimpleMaterial.qml}{SimpleMaterial.qml}
using \l Material type. First the material specifies parameters,