summaryrefslogtreecommitdiffstats
path: root/src/render/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/frontend')
-rw-r--r--src/render/frontend/framegraph-components/qframegraph.cpp4
-rw-r--r--src/render/frontend/framegraph-components/qframegraphnode.cpp4
-rw-r--r--src/render/frontend/framegraph-components/qlayerfilter.cpp4
-rw-r--r--src/render/frontend/qabstracttextureimage.cpp6
-rw-r--r--src/render/frontend/qannotation.cpp6
-rw-r--r--src/render/frontend/qblendstate.cpp4
-rw-r--r--src/render/frontend/qlayer.cpp4
-rw-r--r--src/render/frontend/qopenglfilter.cpp14
-rw-r--r--src/render/frontend/qparametermapping.cpp8
-rw-r--r--src/render/frontend/qpointlight.cpp2
-rw-r--r--src/render/frontend/qspotlight.cpp6
-rw-r--r--src/render/frontend/qtextureimage.cpp4
12 files changed, 33 insertions, 33 deletions
diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp
index 754e90ed3..345bff596 100644
--- a/src/render/frontend/framegraph-components/qframegraph.cpp
+++ b/src/render/frontend/framegraph-components/qframegraph.cpp
@@ -74,7 +74,7 @@ QFrameGraphPrivate::QFrameGraphPrivate()
\qmltype FrameGraph
\instantiates Qt3D::QFrameGraph
\inherits Component3D
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For OpenGL ...
*/
@@ -105,7 +105,7 @@ QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, QNode *parent)
}
/*!
- \qmlproperty Qt3D.Render::FrameGraphNode Qt3D.Render::FrameGraph::activeFrameGraph
+ \qmlproperty Qt3D.Renderer::FrameGraphNode Qt3D.Renderer::FrameGraph::activeFrameGraph
Holds the current activeFrameGraph root node.
*/
diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp
index 2f81b786e..9f4d10baa 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode.cpp
+++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp
@@ -65,7 +65,7 @@ QFrameGraphNodePrivate::QFrameGraphNodePrivate()
/*!
\qmltype FrameGraphNode
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\instantiates QFrameGraphNode
\inherits Node
\since 5.5
@@ -103,7 +103,7 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent)
}
/*!
- \qmlproperty bool Qt3D.Render::FrameGraphNode::enabled
+ \qmlproperty bool Qt3D.Renderer::FrameGraphNode::enabled
Holds whether the frame graph node is enabled or disabled.
*/
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp
index cfccfb987..5d52b517e 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.cpp
+++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp
@@ -62,7 +62,7 @@ QLayerFilterPrivate::QLayerFilterPrivate()
\qmltype LayerFilter
\instantiates Qt3D::QLayerFilter
\inherits FrameGraphNode
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For ...
*/
@@ -98,7 +98,7 @@ QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent)
*/
/*!
- \qmlproperty stringlist Qt3D.Render::LayerFilter::layers
+ \qmlproperty stringlist Qt3D.Renderer::LayerFilter::layers
*/
diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp
index 96d679df6..c26503db9 100644
--- a/src/render/frontend/qabstracttextureimage.cpp
+++ b/src/render/frontend/qabstracttextureimage.cpp
@@ -51,7 +51,7 @@ namespace Qt3D {
\qmltype AbstractTextureImage
\instantiates Qt3D::QAbstractTextureImage
\inherits Node
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\qmlabstract
\since 5.5
\brief Encapsulates the necessary information to create an OpenGL texture image.
@@ -110,7 +110,7 @@ int QAbstractTextureImage::mipmapLevel() const
}
/*!
- \qmlproperty int Qt3D.Render::AbstractTextureImage::layer
+ \qmlproperty int Qt3D.Renderer::AbstractTextureImage::layer
Holds the layer of the texture image.
*/
@@ -127,7 +127,7 @@ int QAbstractTextureImage::layer() const
}
/*!
- \qmlproperty enumeration Qt3D.Render::AbstractTextureImage::cubeMapFace
+ \qmlproperty enumeration Qt3D.Renderer::AbstractTextureImage::cubeMapFace
Holds the cube map face of the texture image.
diff --git a/src/render/frontend/qannotation.cpp b/src/render/frontend/qannotation.cpp
index 0476e1d6a..e04c26047 100644
--- a/src/render/frontend/qannotation.cpp
+++ b/src/render/frontend/qannotation.cpp
@@ -64,7 +64,7 @@ QAnnotationPrivate::QAnnotationPrivate()
\qmltype Annotation
\instantiates Qt3D::QAnnotation
\inherits Node
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For annotating ...
*/
@@ -112,7 +112,7 @@ void QAnnotation::setName(const QString &name)
*/
/*!
- \qmlproperty variant Qt3D.Render::Annotation::value
+ \qmlproperty variant Qt3D.Renderer::Annotation::value
*/
QVariant QAnnotation::value() const
@@ -127,7 +127,7 @@ QVariant QAnnotation::value() const
*/
/*!
- \qmlproperty string Qt3D.Render::Annotation::name
+ \qmlproperty string Qt3D.Renderer::Annotation::name
*/
QString QAnnotation::name() const
diff --git a/src/render/frontend/qblendstate.cpp b/src/render/frontend/qblendstate.cpp
index 642ce03ab..b1c80f76e 100644
--- a/src/render/frontend/qblendstate.cpp
+++ b/src/render/frontend/qblendstate.cpp
@@ -75,7 +75,7 @@ public:
\qmltype BlendState
\instantiates Qt3D::QBlendState
\inherits RenderState
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief Encapsulates blending information
*/
@@ -241,7 +241,7 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha)
\qmltype BlendStateSeparate
\instantiates Qt3D::QBlendStateSeparate
\inherits RenderState
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief Encapsulates blending information
*/
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp
index afef8df3f..c3767baf5 100644
--- a/src/render/frontend/qlayer.cpp
+++ b/src/render/frontend/qlayer.cpp
@@ -61,7 +61,7 @@ QLayerPrivate::QLayerPrivate()
\qmltype Layer
\instantiates Qt3D::QLayer
\inherits Component3D
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For ...
*/
@@ -98,7 +98,7 @@ QLayer::QLayer(QLayerPrivate &dd, QNode *parent)
*/
/*!
- \qmlproperty stringlist Qt3D.Render::Layer::names
+ \qmlproperty stringlist Qt3D.Renderer::Layer::names
*/
diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp
index c6bf6da1a..101c28366 100644
--- a/src/render/frontend/qopenglfilter.cpp
+++ b/src/render/frontend/qopenglfilter.cpp
@@ -74,7 +74,7 @@ public:
\qmltype OpenGLFilter
\instantiates Qt3D::QOpenGLFilter
\inherits QtObject
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For OpenGL ...
*/
@@ -124,7 +124,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref)
*/
/*!
- \qmlproperty enumeration Qt3D.Render::OpenGLFilter::api
+ \qmlproperty enumeration Qt3D.Renderer::OpenGLFilter::api
\value ES QSurfaceFormat::OpenGLES
@@ -143,7 +143,7 @@ QOpenGLFilter::Api QOpenGLFilter::api() const
*/
/*!
- \qmlproperty enumeration Qt3D.Render::OpenGLFilter::profile
+ \qmlproperty enumeration Qt3D.Renderer::OpenGLFilter::profile
\value None QSurfaceFormat::NoProfile
\value Core QSurfaceFormat::CoreProfile
@@ -162,7 +162,7 @@ QOpenGLFilter::Profile QOpenGLFilter::profile() const
*/
/*!
- \qmlproperty int Qt3D.Render::OpenGLFilter::minorVersion
+ \qmlproperty int Qt3D.Renderer::OpenGLFilter::minorVersion
*/
@@ -178,7 +178,7 @@ int QOpenGLFilter::minorVersion() const
*/
/*!
- \qmlproperty int Qt3D.Render::OpenGLFilter::majorVersion
+ \qmlproperty int Qt3D.Renderer::OpenGLFilter::majorVersion
*/
@@ -194,7 +194,7 @@ int QOpenGLFilter::majorVersion() const
*/
/*!
- \qmlproperty stringlist Qt3D.Render::OpenGLFilter::extensions
+ \qmlproperty stringlist Qt3D.Renderer::OpenGLFilter::extensions
*/
@@ -210,7 +210,7 @@ QStringList QOpenGLFilter::extensions() const
*/
/*!
- \qmlproperty string Qt3D.Render::OpenGLFilter::vendor
+ \qmlproperty string Qt3D.Renderer::OpenGLFilter::vendor
*/
diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/frontend/qparametermapping.cpp
index e2b266f8d..6214e2a17 100644
--- a/src/render/frontend/qparametermapping.cpp
+++ b/src/render/frontend/qparametermapping.cpp
@@ -61,7 +61,7 @@ QParameterMappingPrivate::QParameterMappingPrivate()
\qmltype ParameterMapping
\instantiates Qt3D::QParameterMapping
\inherits Node
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For ...
*/
@@ -121,7 +121,7 @@ QParameterMapping::QParameterMapping(const QString &parameterName, const QString
*/
/*!
- \qmlproperty string Qt3D.Render::ParameterMapping::parameterName
+ \qmlproperty string Qt3D.Renderer::ParameterMapping::parameterName
*/
@@ -140,7 +140,7 @@ void QParameterMapping::setParameterName(const QString &name)
*/
/*!
- \qmlproperty string Qt3D.Render::ParameterMapping::shaderVariableName
+ \qmlproperty string Qt3D.Renderer::ParameterMapping::shaderVariableName
*/
@@ -159,7 +159,7 @@ void QParameterMapping::setShaderVariableName(const QString &name)
*/
/*!
- \qmlproperty BindingType Qt3D.Render::ParameterMapping::bindingType
+ \qmlproperty BindingType Qt3D.Renderer::ParameterMapping::bindingType
\value Uniform
\value Attribute
diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp
index 77cb68954..f4ade9b5d 100644
--- a/src/render/frontend/qpointlight.cpp
+++ b/src/render/frontend/qpointlight.cpp
@@ -78,7 +78,7 @@ QPointLightPrivate::QPointLightPrivate()
\qmltype PointLight
\instantiates Qt3D::QPointLight
\inherits AbstractLight
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For OpenGL ...
*/
diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp
index cef18fe10..2eb947d64 100644
--- a/src/render/frontend/qspotlight.cpp
+++ b/src/render/frontend/qspotlight.cpp
@@ -83,7 +83,7 @@ QSpotLightPrivate::QSpotLightPrivate()
\qmltype SpotLight
\instantiates Qt3D::QSpotLight
\inherits AbstractLight
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief For OpenGL ...
*/
@@ -119,7 +119,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
}
/*!
- \qmlproperty vector3d Qt3D.Render::SpotLight::direction
+ \qmlproperty vector3d Qt3D.Renderer::SpotLight::direction
*/
@@ -136,7 +136,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
/*!
- \qmlproperty float Qt3D.Render::SpotLight::cutOffAngle
+ \qmlproperty float Qt3D.Renderer::SpotLight::cutOffAngle
*/
diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp
index e3ada359a..4596bf943 100644
--- a/src/render/frontend/qtextureimage.cpp
+++ b/src/render/frontend/qtextureimage.cpp
@@ -106,7 +106,7 @@ private:
\qmltype TextureImage
\instantiates Qt3D::QTextureImage
\inherits AbstractTextureImage
- \inqmlmodule Qt3D.Render
+ \inqmlmodule Qt3D.Renderer
\since 5.5
\brief Encapsulates the necessary information to create an OpenGL texture
image from an image source.
@@ -144,7 +144,7 @@ QUrl QTextureImage::source() const
*/
/*!
- \qmlproperty url Qt3D.Render::TextureImage::source
+ \qmlproperty url Qt3D.Renderer::TextureImage::source
This property holdsthe source url from which data for the texture
image will be loaded.