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/qt3d.qdocconf | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/doc/qt3d.qdocconf')
| -rw-r--r-- | src/doc/qt3d.qdocconf | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/doc/qt3d.qdocconf b/src/doc/qt3d.qdocconf index 623a2c5d5..7da047ced 100644 --- a/src/doc/qt3d.qdocconf +++ b/src/doc/qt3d.qdocconf @@ -47,7 +47,9 @@ headerdirs += . \ ../plugins \ ../quick3d/quick3d \ ../input \ - ../extras + ../extras \ + ../animation \ + ../quick3d/quick3dscene2d # Exclude private header files from the documentation build excludefiles += "*_p.h" @@ -59,7 +61,9 @@ sourcedirs += . \ ../plugins \ ../quick3d/quick3d \ ../input \ - ../extras + ../extras \ + ../animation \ + ../quick3d/quick3dscene2d exampledirs += ../../examples/qt3d \ snippets @@ -67,14 +71,19 @@ exampledirs += ../../examples/qt3d \ examples.fileextensions += "*.fraq *.geom *.vert" examples.imageextensions += "*.png" -#excludedirs += +excludedirs += \ + ../plugins/renderplugins + macro.TODO = " " imagedirs += images \ ../../examples/qt3d/shadow-map-qml/doc/images \ ../../examples/qt3d/basicshapes-cpp/doc/images \ ../../examples/qt3d/planets-qml/doc/images \ ../../examples/qt3d/wireframe/doc/images \ - ../../examples/qt3d/audio-visualizer-qml/doc/images + ../../examples/qt3d/audio-visualizer-qml/doc/images \ + ../../examples/qt3d/simplecustommaterial/doc/images \ + ../../examples/qt3d/scene2d/doc/images \ + ../../examples/qt3d/advancedcustommaterial/doc/images Cpp.ignoretokens += QT3DINPUTSHARED_EXPORT \ QT3DCORESHARED_EXPORT \ @@ -83,12 +92,16 @@ Cpp.ignoretokens += QT3DINPUTSHARED_EXPORT \ QT3DRENDERSHARED_EXPORT \ QT3DRENDERSHARED_PRIVATE_EXPORT \ QT3DQUICKSHARED_PRIVATE_EXPORT \ - QT3DEXTRASSHARED_EXPORT + QT3DEXTRASSHARED_EXPORT \ + QT3DANIMATIONSHARED_EXPORT \ + QT3DQUICKSCENE2DSHARED_EXPORT Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY -manifestmeta.highlighted.names = "Qt3D/Qt 3D: Audio Visualizer Example" \ - "Qt3D/Qt 3D: Planets QML Example" +manifestmeta.highlighted.names = \ + "Qt3D/Qt 3D: Advanced custom material QML Example" \ + "Qt3D/Qt 3D: Audio Visualizer Example" \ + "Qt3D/Qt 3D: Planets QML Example" manifestmeta.thumbnail.names += "Qt3D/Qt 3D: Deferred Renderer C++ Example" |