From 347832d7593e2369f8597bbd06213b80b3087433 Mon Sep 17 00:00:00 2001 From: Jian Liang Date: Fri, 1 Apr 2016 22:03:15 +0800 Subject: Support color font rendering for freetype engine This patch mainly do two things: 1) Support color bitmap font for freetype fontengine. This partially based on Corentin Jabot's patch 2) Support ARGB opengl glyph cache when workaround_brokenFBOReadBack is true (It is always true under Android). Some code refactor has been done in QOpenGLTextureGlyphCache. This patch also bump the minimal required freetype version to 2.2 [ChangeLog][General][Freetype] Support color font rendering Task-number: QTBUG-35156 Change-Id: I35aae5f98ba9a27b70a48db3f2647fc070c39c33 Reviewed-by: Eskil Abrahamsen Blomfeldt --- config.tests/unix/freetype/freetype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.tests') diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp index 29bbfd8c6d..c051600b02 100644 --- a/config.tests/unix/freetype/freetype.cpp +++ b/config.tests/unix/freetype/freetype.cpp @@ -40,7 +40,7 @@ #include #include FT_FREETYPE_H -#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110) +#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20200) # error "This version of freetype is too old." #endif -- cgit v1.2.3