summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-23 23:01:14 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-23 23:01:15 +0200
commitb73f1cc0453bbda6517ee3db508b02df3723580e (patch)
treee238998bf861b24ce2af57fbc5eb1c3c5bec4506 /configure.json
parent9acd05361923a24ce0dab8477e4e46bf7cb8d22d (diff)
parented557c037847e343caa010562952b398f806adcd (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 16a2af5bab..1f45f2ccb2 100644
--- a/configure.json
+++ b/configure.json
@@ -161,6 +161,7 @@
},
"sources": [
{ "libs": "-lzdll", "condition": "config.msvc" },
+ { "libs": "-lzlib", "condition": "config.msvc" },
{ "libs": "-lz", "condition": "!config.msvc" }
]
},