From d954056627d34907eeee6bba10ddf2e792d90140 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Thu, 22 Oct 2015 15:40:21 +0200 Subject: Doc: Updated the docs for the namespace changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Each of the submodules now have there own namespace so the following changes are required to adapt: - Added \namespace docs for the new namespaces. - Updated all the \class and \instantiates entries to use the appropriate namespace qualifier. - Changed the \module and \qmlmodule names for Qt 3D Core and Qt 3D Render modules. - Added the missing \module and \qmlmodule pages for the Qt 3D Collision module. Change-Id: Ibc5bf30e4f50aecb6a3b24bc8536f17ed19d681d Reviewed-by: Topi Reiniö --- src/render/materialsystem/qannotation.cpp | 2 +- src/render/materialsystem/qopenglfilter.cpp | 2 +- src/render/materialsystem/qparametermapping.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/render/materialsystem') diff --git a/src/render/materialsystem/qannotation.cpp b/src/render/materialsystem/qannotation.cpp index 85a46fcbe..642e0c8c2 100644 --- a/src/render/materialsystem/qannotation.cpp +++ b/src/render/materialsystem/qannotation.cpp @@ -64,7 +64,7 @@ QAnnotationPrivate::QAnnotationPrivate() \qmltype Annotation \instantiates Qt3DRender::QAnnotation \inherits Node - \inqmlmodule Qt3D.Renderer + \inqmlmodule Qt3D.Render \since 5.5 \brief For annotating ... */ diff --git a/src/render/materialsystem/qopenglfilter.cpp b/src/render/materialsystem/qopenglfilter.cpp index fa9437e4a..e334ca88e 100644 --- a/src/render/materialsystem/qopenglfilter.cpp +++ b/src/render/materialsystem/qopenglfilter.cpp @@ -74,7 +74,7 @@ public: \qmltype OpenGLFilter \instantiates Qt3DRender::QOpenGLFilter \inherits QtObject - \inqmlmodule Qt3D.Renderer + \inqmlmodule Qt3D.Render \since 5.5 \brief For OpenGL ... */ diff --git a/src/render/materialsystem/qparametermapping.cpp b/src/render/materialsystem/qparametermapping.cpp index 3890bf8b2..1583983e2 100644 --- a/src/render/materialsystem/qparametermapping.cpp +++ b/src/render/materialsystem/qparametermapping.cpp @@ -61,7 +61,7 @@ QParameterMappingPrivate::QParameterMappingPrivate() \qmltype ParameterMapping \instantiates Qt3DRender::QParameterMapping \inherits Node - \inqmlmodule Qt3D.Renderer + \inqmlmodule Qt3D.Render \since 5.5 \brief For ... */ -- cgit v1.2.3