summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-01-19 09:50:20 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-01-19 09:50:20 +0100
commit38777ea7451d55e9c3d32d88d46063016013f60c (patch)
treef488936e41a60b16e200805351a9aac7caa2e1a7
parent84eae855ee57ab1c37c8a84ad7e7afcd40b919e6 (diff)
parent92f3d851029945d0d156866afe71362d14ae8a53 (diff)
downloadqtsvg-38777ea7451d55e9c3d32d88d46063016013f60c.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-rc1v5.6.05.6.0
Change-Id: I600bace05d6bc88a9f69962698512127d4a4bb4e
-rw-r--r--src/svg/svg.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 89429f9..83e76b7 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -46,7 +46,10 @@ wince*: {
contains(QT_CONFIG, system-zlib) {
if(unix|mingw): LIBS_PRIVATE += -lz
- else: LIBS += zdll.lib
+ else {
+ isEmpty(ZLIB_LIBS): LIBS += zdll.lib
+ else: LIBS += $$ZLIB_LIBS
+ }
} else {
QT_PRIVATE += zlib-private
}