diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
commit | 66feeb8de70291786499b3008ab8fded4043172a (patch) | |
tree | 4c2029d9f51b2471c7c8dc0c3be9311640831595 /src/render/frontend | |
parent | 7eb41022f19a57505c8eef3497ad6710fc92bd7d (diff) | |
parent | 15e863517ea37ca7ba6bcb75b078272eddbc5d37 (diff) |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I666d4ca1ad39f81e41a9b47a8828d1689ff2b33e
Diffstat (limited to 'src/render/frontend')
-rw-r--r-- | src/render/frontend/qrendertarget.cpp | 2 | ||||
-rw-r--r-- | src/render/frontend/qrendertargetoutput.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index bdf8b5fa1..9aa9c8c41 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -70,7 +70,7 @@ namespace Qt3DRender { \brief The RenderTarget class encapsulates a target (usually a frame buffer object) which the renderer can render into. \since 5.7 - \inmodule Qt3D.Render + \inqmlmodule Qt3D.Render \instantiates Qt3DRender::QRenderTarget A RenderTarget comprises of RenderTargetOutput objects, which specify the the buffers diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp index 6d65ec08e..14ac9c817 100644 --- a/src/render/frontend/qrendertargetoutput.cpp +++ b/src/render/frontend/qrendertargetoutput.cpp @@ -64,7 +64,7 @@ namespace Qt3DRender { \brief The RenderTargetOutput type allows the specification of an attachment of a render target (whether it is a color texture, a depth texture, etc... ). \since 5.7 - \inmodule Qt3D.Render + \inqmlmodule Qt3D.Render \inherits Node \instantiates Qt3DRender::QRenderTargetOutput |