properly link to zlib for static windows build

wkhtmltopdf · May 24, 2018 · e75f385 · e75f385
1 parent 6198829
commit e75f385
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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