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

1 files changed, 0 insertions, 31 deletions

diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index f19b9261a..b811057cb 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -93,7 +93,6 @@ namespace Render {
 class AttachmentManager : public Qt3DCore::QResourceManager<
         RenderTargetOutput,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -103,7 +102,6 @@ public:
 class CameraManager : public Qt3DCore::QResourceManager<
         CameraLens,
         Qt3DCore::QNodeId,
-        8,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -113,7 +111,6 @@ public:
 class FilterKeyManager : public Qt3DCore::QResourceManager<
         FilterKey,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 
 {
@@ -124,7 +121,6 @@ public:
 class EffectManager : public Qt3DCore::QResourceManager<
         Effect,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -134,7 +130,6 @@ public:
 class Q_AUTOTEST_EXPORT EntityManager : public Qt3DCore::QResourceManager<
         Entity,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -168,7 +163,6 @@ private:
 class LayerManager : public Qt3DCore::QResourceManager<
         Layer,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -178,7 +172,6 @@ public:
 class LevelOfDetailManager : public Qt3DCore::QResourceManager<
         LevelOfDetail,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -188,7 +181,6 @@ public:
 class MaterialManager : public Qt3DCore::QResourceManager<
         Material,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -198,7 +190,6 @@ public:
 class MatrixManager : public Qt3DCore::QResourceManager<
         QMatrix4x4,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -208,7 +199,6 @@ public:
 class ShaderManager : public Qt3DCore::QResourceManager<
         Shader,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -218,7 +208,6 @@ public:
 class ShaderBuilderManager : public Qt3DCore::QResourceManager<
         ShaderBuilder,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -228,7 +217,6 @@ public:
 class TextureManager : public Qt3DCore::QResourceManager<
         Texture,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -253,7 +241,6 @@ private:
 class TransformManager : public Qt3DCore::QResourceManager<
         Transform,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -263,7 +250,6 @@ public:
 class VAOManager : public Qt3DCore::QResourceManager<
         OpenGLVertexArrayObject,
         VAOIdentifier,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -273,7 +259,6 @@ public:
 class RenderTargetManager : public Qt3DCore::QResourceManager<
         RenderTarget,
         Qt3DCore::QNodeId,
-        8,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -283,7 +268,6 @@ public:
 class RenderPassManager : public Qt3DCore::QResourceManager<
         RenderPass,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -294,7 +278,6 @@ public:
 class ParameterManager : public Qt3DCore::QResourceManager<
         Parameter,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -304,7 +287,6 @@ public:
 class ShaderDataManager : public Qt3DCore::QResourceManager<
         ShaderData,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -314,7 +296,6 @@ public:
 class GLBufferManager : public Qt3DCore::QResourceManager<
         GLBuffer,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -322,7 +303,6 @@ class GLBufferManager : public Qt3DCore::QResourceManager<
 class TextureImageManager : public Qt3DCore::QResourceManager<
         TextureImage,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -330,7 +310,6 @@ class TextureImageManager : public Qt3DCore::QResourceManager<
 class AttributeManager : public Qt3DCore::QResourceManager<
         Attribute,
         Qt3DCore::QNodeId,
-        20,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -338,7 +317,6 @@ class AttributeManager : public Qt3DCore::QResourceManager<
 class GeometryManager : public Qt3DCore::QResourceManager<
         Geometry,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -346,7 +324,6 @@ class GeometryManager : public Qt3DCore::QResourceManager<
 class ObjectPickerManager : public Qt3DCore::QResourceManager<
         ObjectPicker,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -355,7 +332,6 @@ class ObjectPickerManager : public Qt3DCore::QResourceManager<
 class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager<
         BoundingVolumeDebug,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
@@ -364,7 +340,6 @@ class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager<
 class LightManager : public Qt3DCore::QResourceManager<
         Light,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -374,7 +349,6 @@ public:
 class EnvironmentLightManager : public Qt3DCore::QResourceManager<
         EnvironmentLight,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -384,7 +358,6 @@ public:
 class ComputeCommandManager : public Qt3DCore::QResourceManager<
         ComputeCommand,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -394,7 +367,6 @@ public:
 class RenderStateManager : public Qt3DCore::QResourceManager<
         RenderStateNode,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -402,7 +374,6 @@ class RenderStateManager : public Qt3DCore::QResourceManager<
 class ArmatureManager : public Qt3DCore::QResourceManager<
         Armature,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 };
@@ -410,7 +381,6 @@ class ArmatureManager : public Qt3DCore::QResourceManager<
 class SkeletonManager : public Qt3DCore::QResourceManager<
         Skeleton,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public:
@@ -430,7 +400,6 @@ private:
 class JointManager : public Qt3DCore::QResourceManager<
         Joint,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::NonLockingPolicy>
 {
 public: