1 files changed, 13 insertions, 6 deletions
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp
index f3f85445e5..7d1daa1716 100644
--- a/src/quick/scenegraph/qsgdefaultcontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultcontext.cpp
@@ -7,6 +7,7 @@
 #include <QtQuick/private/qsgdefaultinternalimagenode_p.h>
 #include <QtQuick/private/qsgdefaultpainternode_p.h>
 #include <QtQuick/private/qsgdefaultglyphnode_p.h>
+#include <QtQuick/private/qsgcurveglyphnode_p.h>
 #include <QtQuick/private/qsgdistancefieldglyphnode_p.h>
 #include <QtQuick/private/qsgdistancefieldglyphnode_p_p.h>
 #include <QtQuick/private/qsgrhisupport_p.h>
@@ -19,6 +20,8 @@
 #include <QtQuick/private/qsgdefaultspritenode_p.h>
 #endif
 #include <QtQuick/private/qsgrhishadereffectnode_p.h>
+#include <QtQuick/private/qsginternaltextnode_p.h>
+#include <QtQuick/private/qsgrhiinternaltextnode_p.h>
 
 #include <QOpenGLContext>
 
@@ -29,10 +32,7 @@
 
 #include <algorithm>
 
-#include <QtGui/private/qrhi_p.h>
-#if QT_CONFIG(opengl)
-#  include <QtGui/private/qrhigles2_p.h>
-#endif
+#include <rhi/qrhi.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -147,11 +147,18 @@ QSGPainterNode *QSGDefaultContext::createPainterNode(QQuickPaintedItem *item)
     return new QSGDefaultPainterNode(item);
 }
 
+QSGInternalTextNode *QSGDefaultContext::createInternalTextNode(QSGRenderContext *renderContext)
+{
+    return new QSGRhiInternalTextNode(renderContext);
+}
+
 QSGGlyphNode *QSGDefaultContext::createGlyphNode(QSGRenderContext *rc,
-                                                 bool preferNativeGlyphNode,
+                                                 QSGTextNode::RenderType renderType,
                                                  int renderTypeQuality)
 {
-    if (m_distanceFieldDisabled || preferNativeGlyphNode) {
+    if (renderType == QSGTextNode::CurveRendering) {
+        return new QSGCurveGlyphNode(rc);
+    } else if (m_distanceFieldDisabled || renderType == QSGTextNode::NativeRendering) {
         return new QSGDefaultGlyphNode(rc);
     } else {
         QSGDistanceFieldGlyphNode *node = new QSGDistanceFieldGlyphNode(rc);