summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-09-09 12:02:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-10 08:13:07 +0200
commit8c58640fdfe5d182cd8ab9ad0598c54c0487eb7c (patch)
tree23264609bad956105c666e59cd9a06f7ee2b7dc0 /src/gui
parent106843ad1afa2f5c0aedaa748088d4ebacd6d73d (diff)
Use Qt's own glyph cache with the freetype engine.
This fixes rendering in the OpenGL paint engine, simplifies our internal code paths and also produces nicer text for non-90 rotated glyphs Change-Id: Ib206065cd486ac29067f9ebf4a0d74189a673f1e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/qfontengine_ft.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index cad9b02f41..61f4781e3f 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -631,8 +631,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd)
#endif
defaultFormat = Format_None;
embeddedbitmap = false;
- const QByteArray env = qgetenv("QT_NO_FT_CACHE");
- cacheEnabled = env.isEmpty() || env.toInt() == 0;
+ cacheEnabled = qEnvironmentVariableIsSet("QT_USE_FT_CACHE");
m_subPixelPositionCount = 4;
}