diff options
| author | Liang Qi <liang.qi@qt.io> | 2021-06-25 22:34:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2021-08-16 17:26:29 +0000 |
| commit | cfa631e0fb5d78aac80cb580eb092fafa1cd9a8f (patch) | |
| tree | 1484d99daec3f6d405f30f7aa933ebcc32aa4187 /src/3rdparty/freetype/src/sfnt/ttcpal.h | |
| parent | d4015a21a4b7bfc1fb982ecfae1b25d1b21a5005 (diff) | |
Update bundled Freetype to 2.10.4
Removed everything, imported with help of import_from_tarball.sh script,
and then added a pre-generated builds/unix/ftconfig.h
This also amends 58f56950848bae9c90da3873090c7698e0128b12 because it is
not a clean update, some old files are still there.
Also redo the fix for wasm like 30f4ca4e4fbc1d8cf86808dbeb00ec3c046f6c1c.
Fixes: QTBUG-82480
Pick-to: 6.2
Change-Id: I45ee3230299908ca0372e035636dd64b6c549a27
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/src/sfnt/ttcpal.h')
| -rw-r--r-- | src/3rdparty/freetype/src/sfnt/ttcpal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/src/sfnt/ttcpal.h b/src/3rdparty/freetype/src/sfnt/ttcpal.h index d1b244f3e3..b544be696a 100644 --- a/src/3rdparty/freetype/src/sfnt/ttcpal.h +++ b/src/3rdparty/freetype/src/sfnt/ttcpal.h @@ -4,7 +4,7 @@ * * TrueType and OpenType color palette support (specification). * - * Copyright (C) 2018-2019 by + * Copyright (C) 2018-2020 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * Originally written by Shao Yu Zhang <shaozhang@fb.com>. @@ -22,7 +22,6 @@ #define __TTCPAL_H__ -#include <ft2build.h> #include "ttload.h" |