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/src.pro | |
| 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/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 167133859b..999fc2ce90 100644 --- a/src/src.pro +++ b/src/src.pro @@ -129,7 +129,7 @@ src_plugins.depends = src_sql src_xml src_network src_android.subdir = $$PWD/android # this order is important -contains(QT_CONFIG, zlib)|cross_compile: SUBDIRS += src_qtzlib +!contains(QT_CONFIG, system-zlib)|cross_compile: SUBDIRS += src_qtzlib SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_DISABLED_FEATURES, regularexpression):pcre { SUBDIRS += src_3rdparty_pcre |