From 33ab1d454b1a87cd2e44c185c640565edfc73e38 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Sat, 25 Jul 2015 11:43:39 +0300
Subject: Support custom ZLIB library name(s)

This is already the case for qtbase and qtwebkit, while here only
hard-coded "zdll.lib" was used on Windows.

Change-Id: I6592ed8cfc667db58cb7ab65f97f00fc83e8e7d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/3rdparty/zlib_dependency.pri | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/3rdparty/zlib_dependency.pri')

diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 74efbbb..5532acf 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 {
     load(qt_build_paths)
     git_build: \
-- 
cgit v1.2.3