diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2018-12-10 14:59:49 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2019-01-31 10:40:41 +0000 |
| commit | 02280535bea08395871722f733aaaed70c992260 (patch) | |
| tree | 8ff7fd6a26710645d18887fad6299ae7debfded1 /src/3rdparty/freetype/docs/CUSTOMIZE | |
| parent | 93a803a6de27d9eb57931c431b5f3d074914f693 (diff) | |
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>
Diffstat (limited to 'src/3rdparty/freetype/docs/CUSTOMIZE')
| -rw-r--r-- | src/3rdparty/freetype/docs/CUSTOMIZE | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/freetype/docs/CUSTOMIZE b/src/3rdparty/freetype/docs/CUSTOMIZE index 42fc313811..916be32754 100644 --- a/src/3rdparty/freetype/docs/CUSTOMIZE +++ b/src/3rdparty/freetype/docs/CUSTOMIZE @@ -117,15 +117,15 @@ IV. Overriding default configuration and module headers name the configuration headers. To do so, you need a custom `ft2build.h' whose content can be as simple as: - #ifndef __FT2_BUILD_MY_PLATFORM_H__ - #define __FT2_BUILD_MY_PLATFORM_H__ + #ifndef FT2_BUILD_MY_PLATFORM_H_ + #define FT2_BUILD_MY_PLATFORM_H_ #define FT_CONFIG_OPTIONS_H <custom/my-ftoption.h> #define FT_CONFIG_MODULES_H <custom/my-ftmodule.h> #include <freetype/config/ftheader.h> - #endif /* __FT2_BUILD_MY_PLATFORM_H__ */ + #endif /* FT2_BUILD_MY_PLATFORM_H_ */ Place those files in a separate directory, e.g., @@ -139,7 +139,7 @@ IV. Overriding default configuration and module headers ---------------------------------------------------------------------- -Copyright 2003-2015 by +Copyright 2003-2018 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, |