From a332a7d6c3afe310ae5fe00cbbdc3aadcfa597bb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 19 Feb 2016 15:18:47 +0100 Subject: Remove support for the obsolete -no-zlib configure arg Simplify the handling in the pro files as well. system-zlib is the only option deciding whether we use our bundled copy or the system lib. Change-Id: Id28c1c64c5944e86f0e9cd3533268f43e98522a1 Reviewed-by: Oswald Buddenhagen --- src/tools/bootstrap/bootstrap.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/bootstrap') diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 522e13b17b..a412689ddf 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -138,7 +138,7 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } -if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) +!contains(QT_CONFIG, system-zlib)|cross_compile:include(../../3rdparty/zlib.pri) else:include(../../3rdparty/zlib_dependency.pri) win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 -- cgit v1.2.3