diff options
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 6845c67463..074724941f 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1485,11 +1485,6 @@ bool QFontEngineFT::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs return false; } -#if !defined(QT_NO_FONTCONFIG) - extern QMutex *qt_fontdatabase_mutex(); - QMutex *mtx = 0; -#endif - bool mirrored = flags & QTextEngine::RightToLeft; int glyph_pos = 0; if (freetype->symbol_map) { @@ -1500,11 +1495,6 @@ bool QFontEngineFT::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs if ( !glyphs->glyphs[glyph_pos] ) { glyph_t glyph; #if !defined(QT_NO_FONTCONFIG) - if (!mtx) { - mtx = qt_fontdatabase_mutex(); - mtx->lock(); - } - if (freetype->charset != 0 && FcCharSetHasChar(freetype->charset, uc)) { #else if (false) { @@ -1535,11 +1525,6 @@ bool QFontEngineFT::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs glyphs->glyphs[glyph_pos] = uc < QFreetypeFace::cmapCacheSize ? freetype->cmapCache[uc] : 0; if (!glyphs->glyphs[glyph_pos]) { #if !defined(QT_NO_FONTCONFIG) - if (!mtx) { - mtx = qt_fontdatabase_mutex(); - mtx->lock(); - } - if (freetype->charset == 0 || FcCharSetHasChar(freetype->charset, uc)) #endif { @@ -1561,11 +1546,6 @@ bool QFontEngineFT::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs *nglyphs = glyph_pos; glyphs->numGlyphs = glyph_pos; -#if !defined(QT_NO_FONTCONFIG) - if (mtx) - mtx->unlock(); -#endif - if (flags & QTextEngine::GlyphIndicesOnly) return true; |