diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:47:32 +0100 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-12-12 12:23:04 +0200 |
| commit | 54910f8cf827d6f9474de9f6f88b3a158a058c56 (patch) | |
| tree | f8b425821436f02d099299799f794d26345e0d5a /examples/datavisualization/customitems/doc/src/customitems.qdoc | |
| parent | 470330e69b7ee34beb27ed905fcb923d9cfdae31 (diff) | |
| parent | 21c82c7e0db0a567c11ed80eac955d86ad0e1dff (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tests/auto/cpptest/q3dscene/tst_scene.cpp
tests/auto/qmltest/scene3d/tst_scene.qml
Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
Diffstat (limited to 'examples/datavisualization/customitems/doc/src/customitems.qdoc')
| -rw-r--r-- | examples/datavisualization/customitems/doc/src/customitems.qdoc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/examples/datavisualization/customitems/doc/src/customitems.qdoc b/examples/datavisualization/customitems/doc/src/customitems.qdoc index 80dd73a9..a389a6f1 100644 --- a/examples/datavisualization/customitems/doc/src/customitems.qdoc +++ b/examples/datavisualization/customitems/doc/src/customitems.qdoc @@ -39,7 +39,9 @@ \image customitems-example.png - \section1 Adding custom meshes to the application + \include examples-run.qdocinc + + \section1 Adding Custom Meshes to the Application We'll add the meshes in a resource file: @@ -53,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: @@ -73,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: |