diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-02-19 15:18:47 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-15 16:45:19 +0000 |
| commit | a332a7d6c3afe310ae5fe00cbbdc3aadcfa597bb (patch) | |
| tree | 58b3530f52504fa466fc67ff64cda1c2e2dc608c /src/tools | |
| parent | 510272ce6c60fb5304db07f67b7ef67dee9e85f4 (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 |