diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:56 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:04:09 +0200 |
| commit | d4cc70fb26aef2612a32195afd3a88cf068cdbc6 (patch) | |
| tree | 52ed47f387896ea11823d60e9b5f58fef4ac788d /src/render/backend/managers_p.h | |
| parent | 213f8951a12921870987626ec7522672b7bbfacb (diff) | |
| parent | ef2b1fe00f881af7168e2fd8746d2270ec43b11c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I5f770ec0c94ff722a02299f4d03c4e5f53b95bfd
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index c4d873ddc..b62e2f3e0 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -459,6 +459,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::OpenGLVertexArrayObject, Q_REQUIRES_ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Armature, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Skeleton, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Joint, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::ShaderBuilder, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE |