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/corelib/tools/tools.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/tools/tools.pri') diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 5cfeff5a4f..b87f234f40 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -150,10 +150,10 @@ else:win32 { } else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp else:SOURCES += tools/qelapsedtimer_generic.cpp -contains(QT_CONFIG, zlib) { - include($$PWD/../../3rdparty/zlib.pri) -} else { +contains(QT_CONFIG, system-zlib) { include($$PWD/../../3rdparty/zlib_dependency.pri) +} else { + include($$PWD/../../3rdparty/zlib.pri) } contains(QT_CONFIG,icu) { -- cgit v1.2.3