diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:01:00 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-02-20 09:51:12 +0100 |
| commit | 035f934d7a798e97bf0213a5d42a3d511132f03d (patch) | |
| tree | 89aa6efdc86864ce479cddca6b9c4ba523c2754a /src/3rdparty/freetype/src/gzip/rules.mk | |
| parent | f4cc23cffbe3005f0a522cac938695e87ecd6407 (diff) | |
| parent | da4ab444ffac37514435364d4d3f0ad59d4f9bc3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.
Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273
Diffstat (limited to 'src/3rdparty/freetype/src/gzip/rules.mk')
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/rules.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/freetype/src/gzip/rules.mk b/src/3rdparty/freetype/src/gzip/rules.mk index a8f74ec3c3..1a2e48bebd 100644 --- a/src/3rdparty/freetype/src/gzip/rules.mk +++ b/src/3rdparty/freetype/src/gzip/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 2002-2015 by +# Copyright 2002-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -34,12 +34,13 @@ endif # gzip support sources # -# All source and header files get loaded by `ftgzip.c' only if SYTEM_ZLIB is -# not defined (regardless whether we have a `single' or a `multi' build). +# All source and header files get loaded by `ftgzip.c' only if SYSTEM_ZLIB +# is not defined (regardless whether we have a `single' or a `multi' build). # However, it doesn't harm if we add everything as a dependency # unconditionally. # GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c \ + $(GZIP_DIR)/ftzconf.h \ $(GZIP_DIR)/infblock.c \ $(GZIP_DIR)/infblock.h \ $(GZIP_DIR)/infcodes.c \ @@ -50,7 +51,6 @@ GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c \ $(GZIP_DIR)/inftrees.h \ $(GZIP_DIR)/infutil.c \ $(GZIP_DIR)/infutil.h \ - $(GZIP_DIR)/zconf.h \ $(GZIP_DIR)/zlib.h \ $(GZIP_DIR)/zutil.c \ $(GZIP_DIR)/zutil.h |