diff options
| author | Martchus | 2017-02-09 21:00:16 +0100 |
|---|---|---|
| committer | Martchus | 2017-02-09 21:00:16 +0100 |
| commit | 3c36385937833ef9d8428103f7e065d012f2b744 (patch) | |
| tree | b8665cbe89fee67b18438c7b1040b745722f5d34 /0018-Use-system-zlib-for-build-tools.patch | |
| parent | 35d8549e595d6a64804c4203770f8bcf3e30e7a4 (diff) | |
| download | aur-3c36385937833ef9d8428103f7e065d012f2b744.tar.gz | |
Update to 5.8.0
Diffstat (limited to '0018-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0018-Use-system-zlib-for-build-tools.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0018-Use-system-zlib-for-build-tools.patch b/0018-Use-system-zlib-for-build-tools.patch index fdf6e4422a97..63e1b560bfa3 100644 --- a/0018-Use-system-zlib-for-build-tools.patch +++ b/0018-Use-system-zlib-for-build-tools.patch @@ -1,25 +1,25 @@ -From 3dc08a44504c948ee201bc214277fa634940fa54 Mon Sep 17 00:00:00 2001 +From 206e25be29ac115c84076a2b58bae3a6d0900eb1 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 -Subject: [PATCH 18/26] Use system zlib for build tools +Subject: [PATCH 18/30] Use system zlib for build tools --- src/tools/bootstrap/bootstrap.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index a43105297f..b97ff0aa31 100644 +index d51f9e98a4..2242b7c4f1 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro -@@ -134,7 +134,7 @@ macx { +@@ -127,7 +127,7 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } --contains(QT_CONFIG, zlib)|cross_compile { -+contains(QT_CONFIG, zlib) { +-!qtConfig(system-zlib)|cross_compile { ++!qtConfig(system-zlib) { include(../../3rdparty/zlib.pri) } else { CONFIG += no_core_dep -- -2.11.0 +2.11.1 |