From 3dc08a44504c948ee201bc214277fa634940fa54 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 18/26] 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 a43105297f..b97ff0aa31 100644 --- 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 -- 2.11.0