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, 4 insertions, 4 deletions

diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp
index 784751857..cdf8aae87 100644
--- a/src/render/io/scenemanager.cpp
+++ b/src/render/io/scenemanager.cpp
@@ -44,10 +44,10 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-SceneManager::SceneManager() : Qt3DCore::QResourceManager<Scene,
-                                                          Qt3DCore::QNodeId,
-                                                          8,
-                                                          Qt3DCore::ObjectLevelLockingPolicy>()
+SceneManager::SceneManager()
+    : Qt3DCore::QResourceManager<Scene,
+                                 Qt3DCore::QNodeId,
+                                 Qt3DCore::ObjectLevelLockingPolicy>()
     , m_service(nullptr)
 {
 }