diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
| commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
| tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /src/render/frontend/qshaderdata.cpp | |
| parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) | |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/frontend/qshaderdata.cpp')
| -rw-r--r-- | src/render/frontend/qshaderdata.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/render/frontend/qshaderdata.cpp b/src/render/frontend/qshaderdata.cpp index 0592760ac..848b54bf8 100644 --- a/src/render/frontend/qshaderdata.cpp +++ b/src/render/frontend/qshaderdata.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QShaderDataPrivate + \class Qt3DRender::QShaderDataPrivate \internal */ QShaderDataPrivate::QShaderDataPrivate() @@ -52,7 +52,7 @@ QShaderDataPrivate::QShaderDataPrivate() } /*! - \class Qt3D::QShaderDataPrivate + \class Qt3DRender::QShaderDataPrivate \internal */ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader) @@ -62,14 +62,15 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader) } /*! - * \class Qt3D::QShaderData + * \class Qt3DRender::QShaderData * \inmodule Qt3DRenderer + * * \brief Provides a way of specifying values of a Uniform Block or a shader * structure. * - * \note When subclassing and adding properties to Qt3D::QShaderData, please note - * that if you need to nest an inner Qt3D::QShaderData, the data type of the - * property should be Qt3D::QShaderData* instead of the name of your subclass. + * \note When subclassing and adding properties to Qt3DRender::QShaderData, please note + * that if you need to nest an inner Qt3DRender::QShaderData, the data type of the + * property should be Qt3DRender::QShaderData* instead of the name of your subclass. * * \since 5.5 */ @@ -115,6 +116,6 @@ void QShaderData::copy(const QNode *ref) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE |