diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-17 11:49:32 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-17 11:49:32 +0000 |
| commit | b420edb0b5e914b83c35a071b371d0759eba4d3d (patch) | |
| tree | e84852a8c44a18fe6aeadf29cba5dcdefe8e9e58 /src/logic | |
| parent | 24b2599b91c51ae4b7f2c161cf46696bbde67624 (diff) | |
| parent | e9594f27ccad5667ebc27451f87184296c5cd297 (diff) | |
Merge branch '5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
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() {} |