2018-12-30 23:49:46 +01:00
|
|
|
From 773170ab38b995464a3ee5430c7e7f8fdc84fd8d 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-09-19 20:39:07 +02:00
|
|
|
Subject: [PATCH 19/33] 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
|
2018-12-08 22:06:32 +01:00
|
|
|
index 83e44ff9a4..6b1db38486 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/tools/bootstrap/bootstrap.pro
|
|
|
|
|
+++ b/src/tools/bootstrap/bootstrap.pro
|
2018-12-08 22:06:32 +01:00
|
|
|
@@ -135,7 +135,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-12-22 00:04:30 +01:00
|
|
|
2.20.1
|
2016-09-19 22:18:45 +02:00
|
|
|
|
