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/logic | |
| 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/logic')
| -rw-r--r-- | src/logic/handle_types_p.h | 2 | ||||
| -rw-r--r-- | src/logic/managers_p.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/logic/handle_types_p.h b/src/logic/handle_types_p.h index d137a4047..106241e2c 100644 --- a/src/logic/handle_types_p.h +++ b/src/logic/handle_types_p.h @@ -59,7 +59,7 @@ namespace Qt3DLogic { namespace Logic { class Handler; -typedef Qt3DCore::QHandle<Handler, 16> HHandler; +typedef Qt3DCore::QHandle<Handler> HHandler; } // namespace Logic } // namespace Qt3DLogic diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h index 3d48aab24..17c230d28 100644 --- a/src/logic/managers_p.h +++ b/src/logic/managers_p.h @@ -64,8 +64,7 @@ namespace Logic { class HandlerManager : public Qt3DCore::QResourceManager< Handler, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: HandlerManager() {} |