summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-11-05 06:00:41 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-11-22 21:55:44 +0000
commit25301203bf1d4348dff2fba88d7b75e71e80152c (patch)
tree7ca08284915a2e739eac76c55f15002519079dbd /src/3rdparty
parent5660ce600422e734aa40086efd58c1ab7815eb3e (diff)
Use system libpng in bundled FT, if available
This is the simplest step we take on the way to supporting color bitmap glyphs with FreeType "out-of-the-box". Change-Id: Iebdb7acf937734f66a7944d153026d0735cb53d1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/freetype/freetype.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
index a32579e0f9..e9436febc6 100644
--- a/src/3rdparty/freetype/freetype.pro
+++ b/src/3rdparty/freetype/freetype.pro
@@ -67,5 +67,9 @@ contains(QT_CONFIG, system-zlib) {
DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
include($$PWD/../zlib_dependency.pri)
}
+contains(QT_CONFIG, system-png) {
+ DEFINES += FT_CONFIG_OPTION_USE_PNG
+ include($$PWD/../png_dependency.pri)
+}
DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING