summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-02-01 10:40:56 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-01 23:57:00 +0000
commitf1efd15d430f8d00cf1839b600a9e4b5771b8e38 (patch)
tree23bac621b558d8a99af010420b9897a9b3c10223
parentb1fbaec04c50e063ffacf665fceea388b4500158 (diff)
Fix duplicate symbols warnings in bundled freetype
Some of the listed source files are already included and must not be compiled. Fixes: QTBUG-90777 Change-Id: I80b4ca6a50b882445aca513d800ef8375070d786 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit a4574bfd34d68ac7e670626e21175bf2fb04abb0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/3rdparty/freetype/CMakeLists.txt11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
index 2f5e7b77a9..13f2c434c0 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
@@ -32,12 +27,6 @@ qt_internal_add_3rdparty_library(BundledFreetype
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