diff options
| author | Martchus | 2017-06-08 21:33:56 +0200 |
|---|---|---|
| committer | Martchus | 2017-06-08 21:33:56 +0200 |
| commit | 3df6482af8c916f5105111d1dcf6711e01a56c47 (patch) | |
| tree | 55879cff03b12573e665e21cdd7c7d7e65df1c2d /0019-Use-system-zlib-for-build-tools.patch | |
| parent | 288f048fafcb5879c7c038c7e507b6ea98732b93 (diff) | |
| download | aur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz | |
Update to 5.9.0
Diffstat (limited to '0019-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0019-Use-system-zlib-for-build-tools.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch new file mode 100644 index 000000000000..5494df70e64f --- /dev/null +++ b/0019-Use-system-zlib-for-build-tools.patch @@ -0,0 +1,25 @@ +From aa62a2156a564f8125d3dfdac08124673d123016 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:04:42 +0200 +Subject: [PATCH 19/31] 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 521dd5f0f2..eb8cb4770c 100644 +--- a/src/tools/bootstrap/bootstrap.pro ++++ b/src/tools/bootstrap/bootstrap.pro +@@ -129,7 +129,7 @@ macx { + ../../corelib/io/qstandardpaths_win.cpp + } + +-!qtConfig(system-zlib)|cross_compile { ++!qtConfig(system-zlib) { + include(../../3rdparty/zlib.pri) + } else { + CONFIG += no_core_dep +-- +2.13.0 + |