diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-04-26 17:32:14 +0200 |
|---|---|---|
| committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-04-26 15:48:52 +0000 |
| commit | 900a187aee09b0a82a085979e6df9f275db2daca (patch) | |
| tree | c9e8cfc5a39e902075b7d9fbc8aba542311b451a /src/render/backend/managers_p.h | |
| parent | 1dd56d12719bf13419c7f4f18e2d269f09baae6c (diff) | |
Moves QSortCriterion flag to QSortPolicy and remove it
Change-Id: I44f71671ead23256d5fdc621545492885ff940a5
Task-id: QTBUG-51486
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 77f0e6650..386a552c6 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -60,7 +60,6 @@ #include <Qt3DRender/private/layer_p.h> #include <Qt3DRender/private/material_p.h> #include <Qt3DRender/private/shader_p.h> -#include <Qt3DRender/private/sortcriterion_p.h> #include <Qt3DRender/private/technique_p.h> #include <Qt3DRender/private/texture_p.h> #include <Qt3DRender/private/transform_p.h> @@ -194,17 +193,6 @@ public: ShaderManager() {} }; -class SortCriterionManager : public Qt3DCore::QResourceManager< - SortCriterion, - Qt3DCore::QNodeId, - 8, - Qt3DCore::ArrayAllocatingPolicy, - Qt3DCore::ObjectLevelLockingPolicy> -{ -public: - SortCriterionManager() {} -}; - class TechniqueManager : public Qt3DCore::QResourceManager< Technique, Qt3DCore::QNodeId, @@ -389,7 +377,6 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Entity, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Layer, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Material, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Shader, Q_REQUIRES_CLEANUP) -Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::SortCriterion, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTarget, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Technique, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Texture, Q_REQUIRES_CLEANUP) |