diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:32:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:32:08 +0200 |
commit | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (patch) | |
tree | ce6080c5f9cf59e8aa3d2c16f12fa05950a03bb3 /src/logic | |
parent | 5e13bb3f093627af02f86602ab02f98bbf3648a2 (diff) | |
parent | b9a2aee4115a73cfa220349a3100a559006bb2fa (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ifdf71e3c33a7d1a6c100bba65722625ea19e0b81
Diffstat (limited to 'src/logic')
-rw-r--r-- | src/logic/managers_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h index 6194d260a..3d48aab24 100644 --- a/src/logic/managers_p.h +++ b/src/logic/managers_p.h @@ -65,8 +65,7 @@ namespace Logic { class HandlerManager : public Qt3DCore::QResourceManager< Handler, Qt3DCore::QNodeId, - 16, - Qt3DCore::ArrayAllocatingPolicy> + 16> { public: HandlerManager() {} |