diff options
| author | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2014-12-17 15:58:50 +0530 |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2015-01-08 17:51:03 +0100 |
| commit | 4c3ba94508184ae451b487dd86bee56c7feb3521 (patch) | |
| tree | 48854322ed3370d3ad15aa245f77498d695311aa | |
| parent | 2ac307d6884c1f68f092749076d60dacfc18c365 (diff) | |
| download | qtwebkit-4c3ba94508184ae451b487dd86bee56c7feb3521.tar.gz | |
fix detection of zlib when configuring for Windows
This was synced with qtbase/src/3rdparty/zlib_dependency.pri
which uses correct library name on Windows and allows it to
be overridden via ZLIB_LIBS.
Change-Id: Iec86caf202a0da51f9bb5a5e3d0c62eaed4050b7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Tools/qmake/config.tests/libzlib/libzlib.pro | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Tools/qmake/config.tests/libzlib/libzlib.pro b/Tools/qmake/config.tests/libzlib/libzlib.pro index 816a455c4..2ffc15930 100644 --- a/Tools/qmake/config.tests/libzlib/libzlib.pro +++ b/Tools/qmake/config.tests/libzlib/libzlib.pro @@ -1,3 +1,10 @@ SOURCES = libzlib.cpp OBJECTS_DIR = obj -LIBS += -lz +CONFIG += console +if(unix|mingw):LIBS += -lz +else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS +} + +load(qt_build_config) |