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_dependency.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_dependency.pri')
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 6ac7e59158..f35f310c19 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -2,7 +2,7 @@ qtConfig(system-zlib) { QMAKE_USE_PRIVATE += zlib } else { - INCLUDEPATH += $$PWD/zlib + INCLUDEPATH += $$PWD/zlib/src !no_core_dep { CONFIG += qt QT_PRIVATE += core |