diff options
| author | Mike Gelfand <mikedld@mikedld.com> | 2015-07-25 11:43:39 +0300 |
|---|---|---|
| committer | Mike Gelfand <mikedld@mikedld.com> | 2016-01-30 09:26:28 +0000 |
| commit | 33ab1d454b1a87cd2e44c185c640565edfc73e38 (patch) | |
| tree | 8a51c68f516d580ba59b86db611ca14b595d7803 /src/3rdparty | |
| parent | cba6b5c3a1e30757c71b905f368d38c2b123f85e (diff) | |
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: I6592ed8cfc667db58cb7ab65f97f00fc83e8e7d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 74efbbb..5532acf 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,7 +1,10 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { unix|mingw: LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } else { load(qt_build_paths) git_build: \ |