summaryrefslogtreecommitdiffstats
path: root/examples/datavisualization/customitems/doc/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-08 11:30:15 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-08 11:46:38 +0100
commit3f5c27908314074f177454ddcb1c18fce123fa6c (patch)
tree4fca1ae043413014e997a04a562e7ee6b4ae9270 /examples/datavisualization/customitems/doc/src
parent779f6d8c23e75f12a830a4229db55f28ad1537b7 (diff)
parent90aff7026205d71efde65f1783a06af82e528287 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts: examples/datavisualization/bars/doc/src/bars.qdoc examples/datavisualization/custominput/doc/src/custominput.qdoc examples/datavisualization/customitems/doc/src/customitems.qdoc examples/datavisualization/draggableaxes/doc/src/draggableaxes.qdoc examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc examples/datavisualization/qmlspectrogram/doc/src/qmlspectrogram.qdoc examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc examples/datavisualization/rotations/doc/src/rotations.qdoc examples/datavisualization/scatter/doc/src/scatter.qdoc examples/datavisualization/surface/doc/src/surface.qdoc examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc examples/datavisualization/volumetric/doc/src/volumetric.qdoc src/datavisualization/doc/src/qtdatavisualization.qdoc Change-Id: Ic15e77b1fee0708a235bf21815f72b854981537a
Diffstat (limited to 'examples/datavisualization/customitems/doc/src')
-rw-r--r--examples/datavisualization/customitems/doc/src/customitems.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/datavisualization/customitems/doc/src/customitems.qdoc b/examples/datavisualization/customitems/doc/src/customitems.qdoc
index 9716d8a7..a389a6f1 100644
--- a/examples/datavisualization/customitems/doc/src/customitems.qdoc
+++ b/examples/datavisualization/customitems/doc/src/customitems.qdoc
@@ -41,7 +41,7 @@
\include examples-run.qdocinc
- \section1 Adding custom meshes to the application
+ \section1 Adding Custom Meshes to the Application
We'll add the meshes in a resource file:
@@ -55,7 +55,7 @@
</RCC>
\endcode
- \section1 Adding custom item to a graph
+ \section1 Adding Custom Item to a Graph
In this example we do not have specific textures for our meshes, so we'll just create a small
QImage and fill it with a single color:
@@ -75,7 +75,7 @@
\snippet customitems/customitemgraph.cpp 3
- \section1 Removing custom item from a graph
+ \section1 Removing Custom Item from a Graph
We'll just call \c removeCustomItemAt() with the position of the item: