From 02280535bea08395871722f733aaaed70c992260 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Date: Mon, 10 Dec 2018 14:59:49 +0100
Subject: Update bundled Freetype to 2.9.1

This is required to support the new emoji font on Android 9.

[ChangeLog][Freetype] Upgraded bundled Freetype version to 2.9.1.
This also adds support for the latest emoji font in use on
Android 9.

Fixes: QTBUG-70657
Change-Id: I99be72f0d23c20aca122b8fdadd4ded87b2edce1
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/3rdparty/freetype/src/base/Jamfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/3rdparty/freetype/src/base/Jamfile')

diff --git a/src/3rdparty/freetype/src/base/Jamfile b/src/3rdparty/freetype/src/base/Jamfile
index e39fb096b2..4994c1b4ca 100644
--- a/src/3rdparty/freetype/src/base/Jamfile
+++ b/src/3rdparty/freetype/src/base/Jamfile
@@ -1,6 +1,6 @@
 # FreeType 2 src/base Jamfile
 #
-# Copyright 2001-2015 by
+# Copyright 2001-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -21,10 +21,14 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
                ftadvanc
                ftcalc
                ftdbgmem
+               ftfntfmt
                ftgloadr
+               fthash
+               ftlcdfil
                ftobjs
                ftoutln
                ftpic
+               ftpsprop
                ftrfork
                ftsnames
                ftstream
@@ -49,13 +53,11 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
                     ftbitmap
                     ftcid
                     ftdebug
-                    ftfntfmt
                     ftfstype
                     ftgasp
                     ftglyph
                     ftgxval
                     ftinit
-                    ftlcdfil
                     ftmm
                     ftotval
                     ftpatent
-- 
cgit v1.2.3