From 17826d9e889bbb9f3795e824c5fd2ac299c9e9b3 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Thu, 16 Feb 2017 15:20:34 +0000
Subject: QDistanceFieldGlyphCache cleanup

-made QDistanceFieldGlyphCache and QTextureAtlas private
-remove dptr on QDistanceFieldGlyphCache
-use a static hash on glyphCaches based on current scene being used
-QTextureAtlas parented by scene root node

Task-number: QTBUG-58881
Change-Id: If51d7dfe75e4233b9e7a36473c71fe530247aef7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp')

diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
index 8aad63178..29a5d9883 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
@@ -68,8 +68,6 @@
 #include <Qt3DExtras/qcylindergeometry.h>
 #include <Qt3DExtras/qextrudedtextgeometry.h>
 #include <Qt3DExtras/qextrudedtextmesh.h>
-#include <Qt3DExtras/qtextureatlas.h>
-#include <Qt3DExtras/qdistancefieldglyphcache.h>
 #include <Qt3DExtras/qdistancefieldtext.h>
 #include <Qt3DExtras/qmorphphongmaterial.h>
 #include <Qt3DQuickExtras/private/quick3dlevelofdetailloader_p.h>
@@ -126,7 +124,6 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DExtras::QExtrudedTextGeometry>(uri, 2, 9, "ExtrudedTextGeometry");
     qmlRegisterType<Qt3DExtras::QExtrudedTextMesh>(uri, 2, 9, "ExtrudedTextMesh");
 
-    qmlRegisterType<Qt3DExtras::QDistanceFieldGlyphCache>(uri, 2, 9, "DistanceFieldGlyphCache");
     qmlRegisterType<Qt3DExtras::QDistanceFieldText>(uri, 2, 9, "DistanceFieldText");
 }
 
-- 
cgit v1.2.3