-
Bug
-
Resolution: Done
-
P2: Important
-
6.1.0
-
None
-
Windows 10, MSVC 2019
-
Windows
-
a4574bfd34d68ac7e670626e21175bf2fb04abb0 (qt/qtbase/dev) f1efd15d430f8d00cf1839b600a9e4b5771b8e38 (qt/qtbase/6.0)
There are warnings about Freetype duplicate symbols when linking.
ftbase.c & otvalid.c already include other files.
Please review the following patch:
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
index 2f5e7b77a9..4424f152ff 100644
--- a/src/3rdparty/freetype/CMakeLists.txt
+++ b/src/3rdparty/freetype/CMakeLists.txt
@@ -9,18 +9,13 @@ qt_internal_add_3rdparty_library(BundledFreetype
STATIC
INSTALL
SOURCES
- src/autofit/afdummy.c
- src/autofit/afhints.c
- src/autofit/aflatin.c
src/autofit/autofit.c
src/base/ftbase.c
src/base/ftbbox.c
src/base/ftbitmap.c
src/base/ftdebug.c
- src/base/ftfntfmt.c
src/base/ftglyph.c
src/base/ftinit.c
- src/base/ftlcdfil.c
src/base/ftmm.c
src/base/ftsynth.c
src/base/fttype1.c
@@ -31,13 +26,6 @@ qt_internal_add_3rdparty_library(BundledFreetype
src/gzip/ftgzip.c
src/lzw/ftlzw.c
src/otvalid/otvalid.c
- src/otvalid/otvbase.c
- src/otvalid/otvcommn.c
- src/otvalid/otvgdef.c
- src/otvalid/otvgpos.c
- src/otvalid/otvgsub.c
- src/otvalid/otvjstf.c
- src/otvalid/otvmod.c
src/pcf/pcf.c
src/pfr/pfr.c
src/psaux/psaux.c