2020-09-10 21:17:46 +02:00
|
|
|
From 2509527af89dd69120d68c9a6959028a18649996 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
|
2019-12-13 01:00:48 +01:00
|
|
|
Subject: [PATCH 17/31] Use system zlib for build tools
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
---
|
2019-02-02 18:18:25 +01:00
|
|
|
src/tools/bootstrap/bootstrap.pro | 4 +++-
|
|
|
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
|
2020-05-29 17:30:23 +02:00
|
|
|
index c212ccbb6f..1bf9f1e4f9 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/tools/bootstrap/bootstrap.pro
|
|
|
|
|
+++ b/src/tools/bootstrap/bootstrap.pro
|
2020-05-29 17:30:23 +02:00
|
|
|
@@ -158,7 +158,9 @@ 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 {
|
2019-02-02 18:18:25 +01:00
|
|
|
+cross_compile {
|
|
|
|
|
+ LIBS += -lz
|
|
|
|
|
+} else:!qtConfig(system-zlib) {
|
2016-09-19 22:18:45 +02:00
|
|
|
include(../../3rdparty/zlib.pri)
|
|
|
|
|
} else {
|
|
|
|
|
CONFIG += no_core_dep
|
|
|
|
|
--
|
2020-09-10 21:17:46 +02:00
|
|
|
2.28.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|
