2016-12-20 23:05:26 +01:00
|
|
|
From 3dc08a44504c948ee201bc214277fa634940fa54 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
|
2016-12-05 20:32:16 +01:00
|
|
|
Subject: [PATCH 18/26] 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
|
2016-12-20 23:05:26 +01:00
|
|
|
index a43105297f..b97ff0aa31 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/src/tools/bootstrap/bootstrap.pro
|
|
|
|
|
+++ b/src/tools/bootstrap/bootstrap.pro
|
|
|
|
|
@@ -134,7 +134,7 @@ macx {
|
|
|
|
|
../../corelib/io/qstandardpaths_win.cpp
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-contains(QT_CONFIG, zlib)|cross_compile {
|
|
|
|
|
+contains(QT_CONFIG, zlib) {
|
|
|
|
|
include(../../3rdparty/zlib.pri)
|
|
|
|
|
} else {
|
|
|
|
|
CONFIG += no_core_dep
|
|
|
|
|
--
|
2016-12-20 23:05:26 +01:00
|
|
|
2.11.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|
