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/framegraph | |
| 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/framegraph')
| -rw-r--r-- | src/render/framegraph/qrenderpassfilter.cpp | 2 | ||||
| -rw-r--r-- | src/render/framegraph/qrenderstateset.cpp | 2 | ||||
| -rw-r--r-- | src/render/framegraph/qtechniquefilter.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 1654b284e..409a97c01 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -72,7 +72,7 @@ namespace Qt3DRender { /*! \qmltype RenderPassFilter - \inmodule Qt3D.Render + \inqmlmodule Qt3D.Render \since 5.7 \instantiates Qt3DRender::QRenderPassFilter \inherits FrameGraphNode diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index f44e9d50f..6f70456ab 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -101,7 +101,7 @@ QRenderStateSetPrivate::QRenderStateSetPrivate() /*! \qmltype RenderStateSet - \inmodule Qt3D.Render + \inqmlmodule Qt3D.Render \since 5.5 \inherits FrameGraphNode \instantiates Qt3DRender::QRenderStateSet diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 639a6cd15..0f64d8765 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -74,7 +74,7 @@ QTechniqueFilterPrivate::QTechniqueFilterPrivate() /*! \qmltype TechniqueFilter - \inmodule Qt3D.Render + \inqmlmodule Qt3D.Render \instantiates Qt3DRender::QTechniqueFilter \inherits FrameGraphNode \since 5.7 |