From 60cb61f9d70ec52f3193bac44384099d921827b3 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 12 Jun 2015 15:43:39 +0200 Subject: Doc: Fix multiple documentation issues - Restore qt3d-index.html as the main landing page. Needed for external linking. - Fix \inmodule commands for Renderer classes - Add proper group so that all three modules are listed on the landing page, both C++ and QML modules - Remove qt3drenderer-index.html (to be consistent with Qt3DCore), copy contents over to the module page and to a new file, qt3d-examples.qdoc. - Fix indexTitles in qdocconf files, and subprojects for Renderer QML types and Qt3D examples Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963 Reviewed-by: Leena Miettinen --- src/core/doc/qt3dcore.qdocconf | 4 +- src/core/doc/src/qt3dcore-index.qdoc | 15 +++-- src/core/doc/src/qt3dcore-module.qdoc | 5 ++ src/render/defaults/qdiffusemapmaterial.cpp | 2 +- .../defaults/qdiffusespecularmapmaterial.cpp | 2 +- src/render/defaults/qforwardrenderer.cpp | 2 +- .../defaults/qnormaldiffusemapalphamaterial.cpp | 2 +- src/render/defaults/qnormaldiffusemapmaterial.cpp | 2 +- .../defaults/qnormaldiffusespecularmapmaterial.cpp | 2 +- src/render/defaults/qpervertexcolormaterial.cpp | 2 +- src/render/defaults/qphongmaterial.cpp | 2 +- src/render/doc/qt3drenderer.qdocconf | 17 ++++- src/render/doc/src/qt3d-examples.qdoc | 41 ++++++++++++ src/render/doc/src/qt3drenderer-index.qdoc | 77 ---------------------- src/render/doc/src/qt3drenderer-module.qdoc | 14 ++++ .../frontend/framegraph-components/qframegraph.cpp | 2 +- .../framegraph-components/qframegraphnode.cpp | 2 +- .../framegraph-components/qlayerfilter.cpp | 2 +- src/render/frontend/qabstracttextureimage.cpp | 2 +- src/render/frontend/qannotation.cpp | 2 +- src/render/frontend/qblendstate.cpp | 4 +- src/render/frontend/qlayer.cpp | 2 +- src/render/frontend/qopenglfilter.cpp | 2 +- src/render/frontend/qparametermapping.cpp | 2 +- src/render/frontend/qpointlight.cpp | 2 +- src/render/frontend/qspotlight.cpp | 2 +- src/render/frontend/qtextureimage.cpp | 2 +- 27 files changed, 106 insertions(+), 109 deletions(-) create mode 100644 src/render/doc/src/qt3d-examples.qdoc delete mode 100644 src/render/doc/src/qt3drenderer-index.qdoc (limited to 'src') diff --git a/src/core/doc/qt3dcore.qdocconf b/src/core/doc/qt3dcore.qdocconf index 65e6e03fe..28f985029 100644 --- a/src/core/doc/qt3dcore.qdocconf +++ b/src/core/doc/qt3dcore.qdocconf @@ -11,7 +11,7 @@ qhp.projects = Qt3DCore qhp.Qt3DCore.file = qt3dcore.qhp qhp.Qt3DCore.namespace = org.qt-project.qt3dcore.$QT_VERSION_TAG qhp.Qt3DCore.virtualFolder = qt3dcore -qhp.Qt3DCore.indexTitle = Qt3D Core +qhp.Qt3DCore.indexTitle = Qt3D Module qhp.Qt3DCore.indexRoot = qhp.Qt3DCore.filterAttributes = qt3dcore $QT_VERSION qtrefdoc @@ -56,6 +56,6 @@ Cpp.ignoretokens += QT3DCORE_PRIVATE_EXPORT \ Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY -navigation.landingpage = "Qt3D Core" +navigation.landingpage = "Qt3D Module" navigation.cppclassespage = "Qt3D Core C++ Classes" navigation.qmltypespage = "Qt3D Core QML Types" diff --git a/src/core/doc/src/qt3dcore-index.qdoc b/src/core/doc/src/qt3dcore-index.qdoc index ec8c6c1b7..5c3bc9794 100644 --- a/src/core/doc/src/qt3dcore-index.qdoc +++ b/src/core/doc/src/qt3dcore-index.qdoc @@ -36,18 +36,22 @@ ****************************************************************************/ /*! - \page qt3dcore-index.html + \page qt3d-index.html \title Qt3D Module \e Qt3D provides functionality for near-realtime simulation systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applications. - The functionality in Qt3D is divided into the following modules: + The functionality in Qt3D is divided into the following C++ modules: \annotatedlist qt3d-modules - Classes, types and functions are declared under the \l Qt3D namespace. + Classes, types and functions are declared under the \l [CPP] {Qt3D} namespace. + + For Qt Quick applications, Qt3D provides the following QML modules: + + \annotatedlist qt3d-qmlmodules \section1 Getting Started @@ -80,9 +84,8 @@ \section1 Reference \list - \li \l {Qt3D}{Qt3D namespace} - \li \l {Qt3D Core C++ Classes} - \li \l {Qt3D Render C++ Classes} + \li \l {Qt3D Overview} + \li \l [CPP] {Qt3D}{Qt3D Namespace} \li \l {Qt3D Examples} \endlist diff --git a/src/core/doc/src/qt3dcore-module.qdoc b/src/core/doc/src/qt3dcore-module.qdoc index d664b8bf6..e04c61737 100644 --- a/src/core/doc/src/qt3dcore-module.qdoc +++ b/src/core/doc/src/qt3dcore-module.qdoc @@ -40,6 +40,7 @@ \brief The Qt3D Core module contains functionality to support near-realtime simulation systems. \ingroup modules + \ingroup qt3d-modules \qtvariable 3dcore The Qt3D Core module provides the foundations and core types used for near-realtime @@ -49,6 +50,7 @@ /*! \namespace Qt3D \inmodule Qt3DCore + \ingroup qt3d-namespaces \brief Contains classes and types that are the foundation of the Qt3D simulation framework, as well as classes that provide the ability to render using the Qt3D @@ -59,6 +61,7 @@ \qmlmodule Qt3D 2.0 \title Qt3D Core QML Types \ingroup qmlmodules + \ingroup qt3d-qmlmodules \brief Provides core Qt3D QML types. @@ -67,4 +70,6 @@ \badcode import Qt3D 2.0 \endcode + + \section1 QML Types */ diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index bb2f05c67..b9ff33cfe 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -132,7 +132,7 @@ void QDiffuseMapMaterialPrivate::init() \class Qt3D::QDiffuseMapMaterial \brief The QDiffuseMapMaterial provides a default implementation of the phong lighting effect where the diffuse light component is read from a texture map. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index aa72cfece..3cfa0a0cd 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -140,7 +140,7 @@ void QDiffuseSpecularMapMaterialPrivate::init() \class Qt3D::QDiffuseSpecularMapMaterial \brief The QDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components are read from texture maps. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp index 0daa26143..7453e1f1e 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/render/defaults/qforwardrenderer.cpp @@ -79,7 +79,7 @@ void QForwardRendererPrivate::init() /*! \class Qt3D::QForwardRenderer \brief The Qt3D::QForwardRenderer provides a default FrameGraph implementation of a forward renderer. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 Forward rendering is how OpenGL is traditionally. It renders directly to the backbuffer diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index 88b9280f4..03e3d9a4e 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -129,7 +129,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() \brief The QNormalDiffuseMapAlphaMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component is read from a texture map and the normals of the mesh being rendered from a normal texture map. In addition, it defines an alpha to coverage and a depth test to be performed in the rendering pass. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index 461d24d76..cbc7ee8b6 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -141,7 +141,7 @@ void QNormalDiffuseMapMaterialPrivate::init() \class Qt3D::QNormalDiffuseMapMaterial \brief The QNormalDiffuseMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component is read from a texture map and the normals of the mesh being rendered from a normal texture map. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index ce154e0cf..2e77418c9 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -147,7 +147,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() \class Qt3D::QNormalDiffuseSpecularMapMaterial \brief The QNormalDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components are read from texture maps and the normals of the mesh being rendered from a normal texture map. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp index c1c68ce0e..578ff35f4 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/render/defaults/qpervertexcolormaterial.cpp @@ -74,7 +74,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate() /*! \class Qt3D::QPerVertexColorMaterial \brief The QPerVertexColorMaterial class provides a default implementation for rendering the color properties set for each vertex. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 This lighting effect is based on the combination of 2 lighting components ambient and diffuse. Ambient is set by the vertex color. diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index 43e9f298c..a1d313c67 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -78,7 +78,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate() /*! \class Qt3D::QPhongMaterial \brief The QPhongMaterial class provides a default implementation of the phong lighting effect. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The phong lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/doc/qt3drenderer.qdocconf b/src/render/doc/qt3drenderer.qdocconf index 4214188db..e56b6f992 100644 --- a/src/render/doc/qt3drenderer.qdocconf +++ b/src/render/doc/qt3drenderer.qdocconf @@ -11,19 +11,29 @@ qhp.projects = Qt3DRenderer qhp.Qt3DRenderer.file = qt3drenderer.qhp qhp.Qt3DRenderer.namespace = org.qt-project.qt3drenderer.$QT_VERSION_TAG qhp.Qt3DRenderer.virtualFolder = qt3drenderer -qhp.Qt3DRenderer.indexTitle = Qt3D Renderer +qhp.Qt3DRenderer.indexTitle = Qt3D Renderer C++ Classes qhp.Qt3DRenderer.indexRoot = qhp.Qt3DRenderer.filterAttributes = qt3drenderer $QT_VERSION qtrefdoc qhp.Qt3DRenderer.customFilters.Qt.name = Qt3DRenderer $QT_VERSION qhp.Qt3DRenderer.customFilters.Qt.filterAttributes = qt3drenderer $QT_VERSION -qhp.Qt3DRenderer.subprojects = classes +qhp.Qt3DRenderer.subprojects = classes qmltypes examples qhp.Qt3DRenderer.subprojects.classes.title = C++ Classes qhp.Qt3DRenderer.subprojects.classes.indexTitle = Qt3D Renderer C++ Classes qhp.Qt3DRenderer.subprojects.classes.selectors = class fake:headerfile qhp.Qt3DRenderer.subprojects.classes.sortPages = true +qhp.Qt3DRenderer.subprojects.qmltypes.title = QML Types +qhp.Qt3DRenderer.subprojects.qmltypes.indexTitle = Qt3D Renderer QML Types +qhp.Qt3DRenderer.subprojects.qmltypes.selectors = qmlclass +qhp.Qt3DRenderer.subprojects.qmltypes.sortPages = true + +qhp.Qt3DRenderer.subprojects.examples.title = Examples +qhp.Qt3DRenderer.subprojects.examples.indexTitle = Qt3D Examples +qhp.Qt3DRenderer.subprojects.examples.selectors = fake:example +qhp.Qt3DRenderer.subprojects.examples.sortPages = true + tagfile = ../../../doc/qt3drenderer/qt3drenderer.tags depends += qtcore qtqml qtquick qt3dcore qtdoc @@ -40,5 +50,6 @@ Cpp.ignoretokens += QT3DRENDERERSHARED_EXPORT \ Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY -navigation.landingpage = "Qt3D Renderer" +navigation.landingpage = "Qt3D Module" navigation.cppclassespage = "Qt3D Renderer C++ Classes" +navigation.qmltypespage = "Qt3D Renderer QML Types" diff --git a/src/render/doc/src/qt3d-examples.qdoc b/src/render/doc/src/qt3d-examples.qdoc new file mode 100644 index 000000000..4ba413e50 --- /dev/null +++ b/src/render/doc/src/qt3d-examples.qdoc @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page qt3d-examples.html + \ingroup all-examples + \title Qt3D Examples + \brief Examples that demonstrate 2D and 3D rendering using Qt3D. + + The following examples demonstrate 2D and 3D rendering using Qt3D. + + \section1 QML Examples + \annotatedlist qt3d-examples-qml + + \section1 C++ Examples + \annotatedlist qt3d-examples-cpp +*/ diff --git a/src/render/doc/src/qt3drenderer-index.qdoc b/src/render/doc/src/qt3drenderer-index.qdoc deleted file mode 100644 index 0aa93fc9c..000000000 --- a/src/render/doc/src/qt3drenderer-index.qdoc +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3drender-index.html - \title Qt3D Renderer - \ingroup qt3d-modules - \brief The Qt3D Renderer module contains functionality to support 2D and 3D rendering using Qt3D. - - \section1 Getting Started - - To use Qt3D classes, add this directive into the C++ files: - - \code - #include - \endcode - - To link against the corresponding C++ libraries, add the following to your qmake project file: - - \code - QT += 3drenderer - \endcode - - \section1 Reference - \list - \li \l {Qt3D Renderer C++ Classes} - \li \l {Qt3D Examples} - \endlist -*/ - -/*! - \page qt3d-examples.html - \ingroup all-examples - \title Qt3D Examples - \brief Examples that demostrate 2D and 3D rendering using Qt3D. - - The following examples demonstrate 2D and 3D rendering using Qt3D. - - \section1 QML Examples - \annotatedlist qt3d-examples-qml - - \section1 C++ Examples - \annotatedlist qt3d-examples-cpp -*/ diff --git a/src/render/doc/src/qt3drenderer-module.qdoc b/src/render/doc/src/qt3drenderer-module.qdoc index 25b551ce4..d927070c3 100644 --- a/src/render/doc/src/qt3drenderer-module.qdoc +++ b/src/render/doc/src/qt3drenderer-module.qdoc @@ -40,11 +40,24 @@ \brief The Qt3D Renderer module contains functionality to support 2D and 3D rendering using Qt3D. \ingroup modules + \ingroup qt3d-modules \qtvariable 3drenderer The Qt3D Renderer module provides an aspect, components, and other supporting types necessary to implement 2D and 3D rendering as part of the Qt3D framework. + To use classes from this module, add this directive into the C++ files: + + \code + #include + \endcode + + To link against the corresponding C++ library, add the following to your qmake project file: + + \badcode + QT += 3drenderer + \endcode + Classes, types, and functions are declared under the \l [Qt3DCore]{Qt3D} namespace. */ @@ -52,6 +65,7 @@ \qmlmodule Qt3D.Renderer 2.0 \title Qt3D Renderer QML Types \ingroup qmlmodules + \ingroup qt3d-qmlmodules \brief Provides Qt3D QML types for rendering. diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp index 345bff596..08636cc0f 100644 --- a/src/render/frontend/framegraph-components/qframegraph.cpp +++ b/src/render/frontend/framegraph-components/qframegraph.cpp @@ -57,7 +57,7 @@ QFrameGraphPrivate::QFrameGraphPrivate() /*! \class FrameGraph - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.3 \brief Defines the rendering method to be used by the renderer diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp index 9f4d10baa..56232a40a 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode.cpp +++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp @@ -53,7 +53,7 @@ QFrameGraphNodePrivate::QFrameGraphNodePrivate() /*! \class QFrameGraphNode - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief Base class of all FrameGraph configuration nodes. diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp index 5d52b517e..fd51419ca 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter.cpp +++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp @@ -53,7 +53,7 @@ QLayerFilterPrivate::QLayerFilterPrivate() /*! \class QLayerFilter - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief The QLayerFilter class provides ... */ diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp index c26503db9..451b275b0 100644 --- a/src/render/frontend/qabstracttextureimage.cpp +++ b/src/render/frontend/qabstracttextureimage.cpp @@ -59,7 +59,7 @@ namespace Qt3D { /*! \class QAbstractTextureImage - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief Encapsulates the necessary information to create an OpenGL texture image. diff --git a/src/render/frontend/qannotation.cpp b/src/render/frontend/qannotation.cpp index e04c26047..567447a47 100644 --- a/src/render/frontend/qannotation.cpp +++ b/src/render/frontend/qannotation.cpp @@ -55,7 +55,7 @@ QAnnotationPrivate::QAnnotationPrivate() /*! \class QAnnotation - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief The QAnnotation class provides ... */ diff --git a/src/render/frontend/qblendstate.cpp b/src/render/frontend/qblendstate.cpp index b1c80f76e..479249fb0 100644 --- a/src/render/frontend/qblendstate.cpp +++ b/src/render/frontend/qblendstate.cpp @@ -66,7 +66,7 @@ public: /*! \class Qt3D::QBlendState - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief Encapsulates blending information. */ @@ -232,7 +232,7 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha) /*! \class QBlendStateSeparate - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief Encapsulates blending information. */ diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp index c3767baf5..3540d9351 100644 --- a/src/render/frontend/qlayer.cpp +++ b/src/render/frontend/qlayer.cpp @@ -52,7 +52,7 @@ QLayerPrivate::QLayerPrivate() /*! \class QLayer - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief The QLayer class provides ... */ diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp index 101c28366..6efd47955 100644 --- a/src/render/frontend/qopenglfilter.cpp +++ b/src/render/frontend/qopenglfilter.cpp @@ -65,7 +65,7 @@ public: /*! \class QOpenGLFilter - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief The QOpenGLFilter class provides ... */ diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/frontend/qparametermapping.cpp index 6214e2a17..eff5b93db 100644 --- a/src/render/frontend/qparametermapping.cpp +++ b/src/render/frontend/qparametermapping.cpp @@ -52,7 +52,7 @@ QParameterMappingPrivate::QParameterMappingPrivate() } /*! \class QParameterMapping - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief The QParameterMapping class provides ... */ diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp index f4ade9b5d..c474c1285 100644 --- a/src/render/frontend/qpointlight.cpp +++ b/src/render/frontend/qpointlight.cpp @@ -69,7 +69,7 @@ QPointLightPrivate::QPointLightPrivate() /*! \class QPointLight - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 */ diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp index 2eb947d64..58901b4fd 100644 --- a/src/render/frontend/qspotlight.cpp +++ b/src/render/frontend/qspotlight.cpp @@ -74,7 +74,7 @@ QSpotLightPrivate::QSpotLightPrivate() /*! \class QSpotLight - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 */ diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp index 4596bf943..cc3725ebc 100644 --- a/src/render/frontend/qtextureimage.cpp +++ b/src/render/frontend/qtextureimage.cpp @@ -93,7 +93,7 @@ private: /*! \class QTextureImage - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief Encapsulates the necessary information to create an OpenGL texture image from an image source. -- cgit v1.2.3