diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-11-05 20:26:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 11:31:44 +0100 |
| commit | a805aa384d0cc95ff17e50a475957ee8f685ea18 (patch) | |
| tree | 73d40c626c4c754b37c04616ceb7a0ef455d5b16 | |
| parent | efb04c8d7d42a11980718e1e43f7aed5d67f3de2 (diff) | |
Revert "Use Qt's own glyph cache with the freetype engine."
This reverts commit 8c58640fdfe5d182cd8ab9ad0598c54c0487eb7c.
The intent was to reduce the maintenance of parallel code paths,
but this had a negative impact on performance so we need to
enable it again.
Change-Id: Ic58f7781ff076055e7c48f20fc0e7a8a2c9e51a4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 8c266fe7b6..8c69ca9753 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -631,7 +631,8 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd) #endif defaultFormat = Format_None; embeddedbitmap = false; - cacheEnabled = qEnvironmentVariableIsSet("QT_USE_FT_CACHE"); + const QByteArray env = qgetenv("QT_NO_FT_CACHE"); + cacheEnabled = env.isEmpty() || env.toInt() == 0; m_subPixelPositionCount = 4; } |