summaryrefslogtreecommitdiffstats
path: root/src/render/texture
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-10-22 15:40:21 +0200
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-10-27 13:21:59 +0000
commitd954056627d34907eeee6bba10ddf2e792d90140 (patch)
tree7d446091c193011540eb044b2d89bfed3c15d224 /src/render/texture
parent31a4c1e3438bc47ac9d488f557f6144f0a7463ba (diff)
Doc: Updated the docs for the namespace changes
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ƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/render/texture')
-rw-r--r--src/render/texture/qabstracttextureimage.cpp6
-rw-r--r--src/render/texture/qtextureimage.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index e19c2fe8d..ce4efeaf8 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -45,15 +45,15 @@ using namespace Qt3DCore;
namespace Qt3DRender {
/*!
- \class Qt3DCore::QAbstractTextureImagePrivate
+ \class Qt3DRender::QAbstractTextureImagePrivate
\internal
*/
/*!
\qmltype AbstractTextureImage
- \instantiates Qt3DCore::QAbstractTextureImage
+ \instantiates Qt3DRender::QAbstractTextureImage
\inherits Node
- \inqmlmodule Qt3D.Renderer
+ \inqmlmodule Qt3D.Render
\qmlabstract
\since 5.5
\brief Encapsulates the necessary information to create an OpenGL texture image.
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index fd2f6524c..19f729eeb 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -111,7 +111,7 @@ private:
\qmltype TextureImage
\instantiates Qt3DRender::QTextureImage
\inherits AbstractTextureImage
- \inqmlmodule Qt3D.Renderer
+ \inqmlmodule Qt3D.Render
\since 5.5
\brief Encapsulates the necessary information to create an OpenGL texture
image from an image source.