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 --- src/3rdparty/freetype/freetype.pro | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/3rdparty/freetype') diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro index 04aa3b8e18..d73d8ece55 100644 --- a/src/3rdparty/freetype/freetype.pro +++ b/src/3rdparty/freetype/freetype.pro @@ -71,6 +71,9 @@ contains(QT_CONFIG, system-zlib) { contains(QT_CONFIG, system-png) { DEFINES += FT_CONFIG_OPTION_USE_PNG include($$PWD/../png_dependency.pri) +} else:!contains(QT_CONFIG, no-png):!win32 { + DEFINES += FT_CONFIG_OPTION_USE_PNG + include($$PWD/../libpng.pri) } DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING -- cgit v1.2.3