diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-06-24 00:11:01 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-04 08:36:22 +0000 |
| commit | 5169d588a599036aa1962f518a7c321f5e3e7296 (patch) | |
| tree | 4268ab94056c9e476b4ae1e73bd88a87975141d4 /src/3rdparty/zlib.pri | |
| parent | 959cc53b618b632d1c768f561c68e0b23b85335f (diff) | |
Update bundled zlib to version 1.2.11
Also clean up some unused files.
The remaining diff to clean 1.2.11 is archived in the qtpatches.diff file.
[ChangeLog][Third-Party Code] zlib was updated to version 1.2.11.
Task-number: QTBUG-31020
Change-Id: I89f890904af48c6e9ba6eabc5d58f5adbe2c53f0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/3rdparty/zlib.pri')
| -rw-r--r-- | src/3rdparty/zlib.pri | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri index ccddb181e1..4d8af3f0c6 100644 --- a/src/3rdparty/zlib.pri +++ b/src/3rdparty/zlib.pri @@ -1,19 +1,19 @@ -INCLUDEPATH = $$PWD/zlib $$INCLUDEPATH +INCLUDEPATH = $$PWD/zlib/src $$INCLUDEPATH SOURCES+= \ - $$PWD/zlib/adler32.c \ - $$PWD/zlib/compress.c \ - $$PWD/zlib/crc32.c \ - $$PWD/zlib/deflate.c \ - $$PWD/zlib/gzclose.c \ - $$PWD/zlib/gzlib.c \ - $$PWD/zlib/gzread.c \ - $$PWD/zlib/gzwrite.c \ - $$PWD/zlib/infback.c \ - $$PWD/zlib/inffast.c \ - $$PWD/zlib/inflate.c \ - $$PWD/zlib/inftrees.c \ - $$PWD/zlib/trees.c \ - $$PWD/zlib/uncompr.c \ - $$PWD/zlib/zutil.c + $$PWD/zlib/src/adler32.c \ + $$PWD/zlib/src/compress.c \ + $$PWD/zlib/src/crc32.c \ + $$PWD/zlib/src/deflate.c \ + $$PWD/zlib/src/gzclose.c \ + $$PWD/zlib/src/gzlib.c \ + $$PWD/zlib/src/gzread.c \ + $$PWD/zlib/src/gzwrite.c \ + $$PWD/zlib/src/infback.c \ + $$PWD/zlib/src/inffast.c \ + $$PWD/zlib/src/inflate.c \ + $$PWD/zlib/src/inftrees.c \ + $$PWD/zlib/src/trees.c \ + $$PWD/zlib/src/uncompr.c \ + $$PWD/zlib/src/zutil.c TR_EXCLUDE += $$PWD/* |