From 5ba26358c537b990edb53904fe8aeb7065319d3e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 25 Jun 2021 22:34:30 +0200 Subject: 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 Reviewed-by: Alexandru Croitor Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit cfa631e0fb5d78aac80cb580eb092fafa1cd9a8f) Reviewed-by: Liang Qi --- src/3rdparty/freetype/src/gxvalid/gxvalid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/3rdparty/freetype/src/gxvalid/gxvalid.c') diff --git a/src/3rdparty/freetype/src/gxvalid/gxvalid.c b/src/3rdparty/freetype/src/gxvalid/gxvalid.c index 462e461bf2..683b8a6972 100644 --- a/src/3rdparty/freetype/src/gxvalid/gxvalid.c +++ b/src/3rdparty/freetype/src/gxvalid/gxvalid.c @@ -4,7 +4,7 @@ * * FreeType validator for TrueTypeGX/AAT tables (body only). * - * Copyright (C) 2005-2019 by + * Copyright (C) 2005-2020 by * suzuki toshiya, Masatake YAMATO, Red Hat K.K., * David Turner, Robert Wilhelm, and Werner Lemberg. * @@ -18,7 +18,6 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT -#include #include "gxvbsln.c" #include "gxvcommn.c" -- cgit v1.2.3