summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gelfand <mikedld@mikedld.com>2015-07-25 11:47:56 +0300
committerMike Gelfand <mikedld@mikedld.com>2016-01-15 18:34:09 +0000
commit92f3d851029945d0d156866afe71362d14ae8a53 (patch)
treea6c4a65d7364edf96faf4658ee6037522b791dbd
parent3bc5fc54165a72b2e1b820ca1f389a048ecdcf30 (diff)
downloadqtsvg-92f3d851029945d0d156866afe71362d14ae8a53.tar.gz
Support custom ZLIB library name(s)5.5
This is already the case for qtbase and qtwebkit, while here only hard-coded "zdll.lib" was used on Windows. Change-Id: I83a86e17ebd0ed6ae4ef47925b3fdaf38984617c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-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 f2906ce..7f9c3c8 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 {
git_build: \
INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib