diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-11 15:08:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-11 15:08:00 +0100 |
| commit | c9ce0deeb8f2bb79c446e41584f753f1b1bfe17f (patch) | |
| tree | 5e9a06346ea22e6e9a2fafd6a2ac7394c73648c6 /src/render/frontend | |
| parent | f1b333c36a19cf85eab798fc1b1952ed063fedfe (diff) | |
| parent | 0a0a7e4ca4f05c7d6da55ec64c8a9734d82853fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/render/renderers/opengl/textures/gltexture.cpp
Change-Id: I57e9a296dc15f0b5dc3af3664f698bdc799c4bb5
Diffstat (limited to 'src/render/frontend')
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 42ada0baa..14fbe1754 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -186,6 +186,7 @@ namespace Qt3DRender { /*! \namespace Qt3DRender::Render + \inmodule Qt3DRender \brief Namespace used for accessing the classes Renderer and QRenderPlugin. |