From e75f3856b74952e24223dbae86c037884370e33a Mon Sep 17 00:00:00 2001
From: Ashish Kulkarni <kulkarni.ashish@gmail.com>
Date: Thu, 24 May 2018 08:28:43 +0530
Subject: [PATCH] properly link to zlib for static windows build

---
 src/3rdparty/zlib_dependency.pri  | 1 +
 src/tools/bootstrap/bootstrap.pri | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 042eb1373f8..a293e9f7b2f 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -2,6 +2,7 @@
 contains(QT_CONFIG, system-zlib) {
     symbian:                 LIBS_PRIVATE += -llibz
     else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+    else:CONFIG(static, shared|static): LIBS += zlib.lib
     else:                    LIBS += zdll.lib
 } else {
     INCLUDEPATH +=  $$PWD/zlib
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index f48c8c12fff..ea28eec199d 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -56,6 +56,7 @@ hpux-acc*|hpuxi-acc* {
 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
     symbian:LIBS_PRIVATE += -llibz
     else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+    else:CONFIG(static, shared|static):LIBS += zlib.lib
     else:LIBS += zdll.lib
 }
 win32:LIBS += -luser32