diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-08-20 19:54:58 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 11:05:20 +0200 |
| commit | 17c89d157a0df2ed9fd0585c8ded21b04278ccf7 (patch) | |
| tree | ab49e6722ceb51523d78f2d7d244486e645df37d /src/3rdparty | |
| parent | 07a978d3d4b41739eff1061dc45dbfa737bf78b9 (diff) | |
make it possible to pass configure zlib lib name
Change-Id: I82fde11436261dab51393b35dfbf2a753df58ec9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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 75dd2396f2..029bb9e637 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) { if(unix|win32-g++*):LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } else { INCLUDEPATH += $$PWD/zlib } |