QWindowsFontEnginge uses GetGlyphOutline which seems to fail

for fonts containing embedded bitmaps.

Change-Id: I035df24d16f1c9707fff54b0920c8139fda3ddec
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 1133636a7465b2244877ba0d78682a50004d3770..da0d9cd71477ec5b717c03c2feaabea607bfe9e0 100644 (file)
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -144,8 +144,15 @@ QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun
 {
     QSGRenderContext *sg = QQuickItemPrivate::get(m_ownerElement)->sceneGraphRenderContext();
     QRawFont font = glyphs.rawFont();
-    bool smoothScalable = QFontDatabase().isSmoothlyScalable(font.familyName(), font.styleName());
-    bool preferNativeGlyphNode = m_useNativeRenderer || !smoothScalable;
+    bool preferNativeGlyphNode = m_useNativeRenderer;
+    if (!preferNativeGlyphNode) {
+        QRawFontPrivate *fontPriv = QRawFontPrivate::get(font);
+        if (fontPriv->fontEngine->hasUnreliableGlyphOutline())
+            preferNativeGlyphNode = true;
+        else
+            preferNativeGlyphNode = !QFontDatabase().isSmoothlyScalable(font.familyName(), font.styleName());
+    }
+
     QSGGlyphNode *node = sg->sceneGraphContext()->createGlyphNode(sg, preferNativeGlyphNode);
 
     node->setOwnerElement(m_ownerElement);