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-17 08:46:40 +0200 |
| commit | 5ba26358c537b990edb53904fe8aeb7065319d3e (patch) | |
| tree | 0f4525bdeb13336d8ca2f5e18845e4239a96801f /src/3rdparty/freetype/src/pcf/pcfutil.h | |
| parent | 265d48f688b4169e60055b15702a90eb54262298 (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>
(cherry picked from commit cfa631e0fb5d78aac80cb580eb092fafa1cd9a8f)
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/src/pcf/pcfutil.h')
| -rw-r--r-- | src/3rdparty/freetype/src/pcf/pcfutil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/src/pcf/pcfutil.h b/src/3rdparty/freetype/src/pcf/pcfutil.h index be986e756b..a197c15595 100644 --- a/src/3rdparty/freetype/src/pcf/pcfutil.h +++ b/src/3rdparty/freetype/src/pcf/pcfutil.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include <ft2build.h> #include FT_CONFIG_CONFIG_H - +#include <freetype/internal/compiler-macros.h> FT_BEGIN_HEADER |