Fallback to native font rendering for bitmap fonts.

Distance field rendering requires glyph outlines, which are not
available for bitmap fonts.

Task-number: QTBUG-32737
Change-Id: I64569e4e6b2285ca998b5f80ec31ab04cf1f3d09
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index 6acfaaf..dd314c8 100644 (file)
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -143,7 +143,8 @@ QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun
                                      QSGNode *parentNode)
 {
     QSGRenderContext *sg = QQuickItemPrivate::get(m_ownerElement)->sceneGraphRenderContext();
-    QSGGlyphNode *node = m_useNativeRenderer
+    QRawFontPrivate *fontP = QRawFontPrivate::get(glyphs.rawFont());
+    QSGGlyphNode *node = m_useNativeRenderer || !fontP->fontEngine->smoothScalable
             ? sg->sceneGraphContext()->createNativeGlyphNode(sg)
             : sg->sceneGraphContext()->createGlyphNode(sg);
     node->setOwnerElement(m_ownerElement);