2018-03-17 17:08:22 +01:00
|
|
|
From 3351283ce62c1d728d245657aa9a81d5e8c43def Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 18 Sep 2016 18:04:42 +0200
|
2018-02-15 00:14:36 +01:00
|
|
|
Subject: [PATCH 19/32] Use system zlib for build tools
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
---
|
|
|
|
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
|
2017-12-08 19:49:53 +01:00
|
|
|
index 042ad7adb9..7e3bc3977a 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/tools/bootstrap/bootstrap.pro
|
|
|
|
+++ b/src/tools/bootstrap/bootstrap.pro
|
2017-12-08 19:49:53 +01:00
|
|
|
@@ -132,7 +132,7 @@ macx {
|
2016-09-19 22:18:45 +02:00
|
|
|
../../corelib/io/qstandardpaths_win.cpp
|
|
|
|
}
|
|
|
|
|
2017-01-23 21:37:13 +01:00
|
|
|
-!qtConfig(system-zlib)|cross_compile {
|
|
|
|
+!qtConfig(system-zlib) {
|
2016-09-19 22:18:45 +02:00
|
|
|
include(../../3rdparty/zlib.pri)
|
|
|
|
} else {
|
|
|
|
CONFIG += no_core_dep
|
|
|
|
--
|
2018-03-17 17:08:22 +01:00
|
|
|
2.16.2
|
2016-09-19 22:18:45 +02:00
|
|
|
|