diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-09-12 12:10:03 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-12 12:39:05 +0100 |
| commit | 3f03499bf8a7cf3c3f8d19a020179c1205980bde (patch) | |
| tree | 518b0ef3fb1b31d3856f43124150ef41acb8c1aa /src/render/io | |
| parent | 8a4b9ebadb9e63ae367694f04786c7faf6306f27 (diff) | |
| parent | bf5fd7a78c91e29332ce70ad844b756150f32f18 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: Id6a3d4ec579a2f2a2e559c22a2293d0e184f0bdf
Diffstat (limited to 'src/render/io')
| -rw-r--r-- | src/render/io/scenemanager.cpp | 10 | ||||
| -rw-r--r-- | src/render/io/scenemanager_p.h | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp index b0a595905..784751857 100644 --- a/src/render/io/scenemanager.cpp +++ b/src/render/io/scenemanager.cpp @@ -44,12 +44,10 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -SceneManager::SceneManager() - : Qt3DCore::QResourceManager<Scene, - Qt3DCore::QNodeId, - 8, - Qt3DCore::ArrayAllocatingPolicy, - Qt3DCore::ObjectLevelLockingPolicy>() +SceneManager::SceneManager() : Qt3DCore::QResourceManager<Scene, + Qt3DCore::QNodeId, + 8, + Qt3DCore::ObjectLevelLockingPolicy>() , m_service(nullptr) { } diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index 9993c85fc..d7dd8c752 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -86,7 +86,6 @@ class Q_AUTOTEST_EXPORT SceneManager : public Qt3DCore::QResourceManager< Scene, Qt3DCore::QNodeId, 8, - Qt3DCore::ArrayAllocatingPolicy, Qt3DCore::ObjectLevelLockingPolicy> { public: |