From 17c89d157a0df2ed9fd0585c8ded21b04278ccf7 Mon Sep 17 00:00:00 2001
From: Andreas Holzammer <andreas.holzammer@kdab.com>
Date: Mon, 20 Aug 2012 19:54:58 +0200
Subject: make it possible to pass configure zlib lib name

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

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 75dd2396f2..029bb9e637 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) {
     if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:               LIBS += zdll.lib
+    else {
+        isEmpty(ZLIB_LIBS): LIBS += zdll.lib
+        else: LIBS += $$ZLIB_LIBS
+    }
 } else {
     INCLUDEPATH +=  $$PWD/zlib
 }
-- 
cgit v1.2.3