diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:16 +0100 |
| commit | cb800de1f42aaacdeb423d30adbcbf8975e32f2f (patch) | |
| tree | 7493c2b814c5f3c780fc7338c62660846fdb6e92 /src/3rdparty/zlib_dependency.pri | |
| parent | 14f86268e7f149a3c881203227321c3fd085e4d9 (diff) | |
| parent | eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Id59a8238134f1b0e172b22cd7e95d984a3f66401
Diffstat (limited to 'src/3rdparty/zlib_dependency.pri')
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 4194fe2..5cccf37 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,7 +1,10 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { unix|mingw: LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } else { QT_PRIVATE += zlib-private } |