diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-10-15 09:40:09 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-10-15 09:40:40 +0200 |
| commit | 7339e9ae93df3720e1b936dd027d821105020bc4 (patch) | |
| tree | f563b7cf4e02ad8a0628fb228733dc841f8ca554 /src/render/renderstates | |
| parent | fd85ebb1e24d48ffdff0659810a1830691bba89f (diff) | |
| parent | 7628760f8f16aba7769c04f2251633faa9fbcad1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
Diffstat (limited to 'src/render/renderstates')
| -rw-r--r-- | src/render/renderstates/qrenderstate.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp index 8a7d897be..cd5346710 100644 --- a/src/render/renderstates/qrenderstate.cpp +++ b/src/render/renderstates/qrenderstate.cpp @@ -59,6 +59,7 @@ namespace Qt3DRender { /*! \qmltype RenderState + \inqmlmodule Qt3D.Render \brief An abstract base type for all render states. \since 5.7 \inherits Node |