diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 14:17:40 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 15:07:06 +0000 |
| commit | 417b32815d5d6c45a6c8b4d38b62ca10119d14fd (patch) | |
| tree | 5c910952affff3d376cbe84b7130be9ee7d6a577 /src/animation/backend/managers_p.h | |
| parent | 1d5f8b8536c1b0165c2292529dc3814e96bb0a27 (diff) | |
| parent | c9edc164ab165ddd31ef2411be19deb130614e8b (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/animation/backend/handle_types_p.h
src/extras/defaults/qtexturematerial.h
src/render/backend/entity_p.h
src/render/backend/handle_types_p.h
src/render/backend/renderview.cpp
src/render/io/scenemanager.cpp
Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
Diffstat (limited to 'src/animation/backend/managers_p.h')
| -rw-r--r-- | src/animation/backend/managers_p.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/animation/backend/managers_p.h b/src/animation/backend/managers_p.h index b88f1b8ae..ba4bcf730 100644 --- a/src/animation/backend/managers_p.h +++ b/src/animation/backend/managers_p.h @@ -71,8 +71,7 @@ class ClipBlendNode; class AnimationClipLoaderManager : public Qt3DCore::QResourceManager< AnimationClip, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: AnimationClipLoaderManager() {} @@ -80,8 +79,7 @@ public: class ClockManager : public Qt3DCore::QResourceManager< Clock, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ClockManager() {} @@ -89,8 +87,7 @@ public: class ClipAnimatorManager : public Qt3DCore::QResourceManager< ClipAnimator, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ClipAnimatorManager() {} @@ -98,8 +95,7 @@ public: class BlendedClipAnimatorManager : public Qt3DCore::QResourceManager< BlendedClipAnimator, - Qt3DCore::QNodeId, - 12> + Qt3DCore::QNodeId> { public: BlendedClipAnimatorManager() {} @@ -107,8 +103,7 @@ public: class ChannelMappingManager : public Qt3DCore::QResourceManager< ChannelMapping, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ChannelMappingManager() {} @@ -116,8 +111,7 @@ public: class ChannelMapperManager : public Qt3DCore::QResourceManager< ChannelMapper, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ChannelMapperManager() {} @@ -140,8 +134,7 @@ private: class SkeletonManager : public Qt3DCore::QResourceManager< Skeleton, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: SkeletonManager() {} |