diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
| commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
| tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /examples/qt3d/basicshapes-cpp | |
| parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
| parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'examples/qt3d/basicshapes-cpp')
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc b/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc index d0540e390..5b1c572ef 100644 --- a/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc +++ b/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc @@ -29,12 +29,12 @@ \example basicshapes-cpp \title Qt 3D: Basic Shapes C++ Example \ingroup qt3d-examples-cpp - \brief Shows four basic shapes that Qt3D offers and sets up a mesh for each of them. + \brief Shows four basic shapes that Qt 3D offers and sets up a mesh for each of them. \image basicshapes-cpp-example.jpg - \e {Basic Shapes} shows four basic shapes that Qt3D offers: a torus, a cylinder, - a cube, and a sphere. The example also shows how to embed a Qt3D scene + \e {Basic Shapes} shows four basic shapes that Qt 3D offers: a torus, a cylinder, + a cube, and a sphere. The example also shows how to embed a Qt 3D scene into a widget and connect with other widgets. \include examples-run.qdocinc |