From 6c5b42b47e4b8b08d5188019171c779b3748236d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 27 Jan 2014 15:15:12 +0100 Subject: Move logic for determining native vs. DF text into single factory function Makes QSGContext::createGlyphNode() the central point of determining which glyph node to produce, instead of letting the caller call two different versions of the factory, each one calling the other in various cases and behind various ifdefs. Change-Id: I30fb17cceab45d9e13ddf3ece7a65f220c5e5acd Reviewed-by: Gunnar Sletta --- src/quick/scenegraph/qsgcontext_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/quick/scenegraph/qsgcontext_p.h') diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index c1bf78a018..883287e35d 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -158,8 +158,7 @@ public: virtual QSGRectangleNode *createRectangleNode(); virtual QSGImageNode *createImageNode(); - virtual QSGGlyphNode *createGlyphNode(QSGRenderContext *rc); - virtual QSGGlyphNode *createNativeGlyphNode(QSGRenderContext *rc); + virtual QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode); virtual QAnimationDriver *createAnimationDriver(QObject *parent); virtual QSize minimumFBOSize() const; -- cgit v1.2.3