Blame SOURCES/qt-everywhere-opensource-src-4.8.7-revert-font-cache-fix.patch

313fad
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
313fad
index d937f38d..2b996440 100644
313fad
--- a/src/gui/text/qfontengine_ft.cpp
313fad
+++ b/src/gui/text/qfontengine_ft.cpp
313fad
@@ -1603,9 +1603,7 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlag
313fad
                    (flags & HB_ShaperFlag_UseDesignMetrics)) && FT_IS_SCALABLE(freetype->face);
313fad
     for (int i = 0; i < glyphs->numGlyphs; i++) {
313fad
         Glyph *g = defaultGlyphSet.getGlyph(glyphs->glyphs[i]);
313fad
-        // Since we are passing Format_None to loadGlyph, use same default format logic as loadGlyph
313fad
-        GlyphFormat acceptableFormat = (defaultFormat != Format_None) ? defaultFormat : Format_Mono;
313fad
-        if (g && g->format == acceptableFormat) {
313fad
+        if (g) {
313fad
             glyphs->advances_x[i] = design ? QFixed::fromFixed(g->linearAdvance) : QFixed(g->advance);
313fad
         } else {
313fad
             if (!face)