diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/doc/src/qt3d-module.qdoc | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/doc/src/qt3d-module.qdoc')
| -rw-r--r-- | src/doc/src/qt3d-module.qdoc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/doc/src/qt3d-module.qdoc b/src/doc/src/qt3d-module.qdoc index c82c528f1..0e26375a9 100644 --- a/src/doc/src/qt3d-module.qdoc +++ b/src/doc/src/qt3d-module.qdoc @@ -77,6 +77,12 @@ \section2 Qt 3D Extras Module \generatelist {classesbymodule Qt3DExtras} + + \section2 Qt 3D Animation Module + \generatelist {classesbymodule Qt3DAnimation} + + \section2 Qt 3D Scene2D Module + \generatelist {classesbymodule Qt3DScene2D} */ /*! @@ -111,6 +117,7 @@ import Qt3D.Input 2.0 import Qt3D.Logic 2.0 import Qt3D.Extras 2.0 + import Qt3D.Animation 2.0 \endcode \section1 QML Types @@ -131,4 +138,12 @@ \section2 Qt 3D Extras Module \generatelist {qmltypesbymodule Qt3D.Extras} \noautolist + + \section2 Qt 3D Animation Module + \generatelist {qmltypesbymodule Qt3D.Animation} + \noautolist + + \section2 Qt 3D Scene2D Module + \generatelist {qmltypesbymodule Qt3D.Scene2D} + \noautolist */ |