diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2016-11-04 11:49:29 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-11-09 10:42:48 +0000 |
| commit | ed30f8b675b7f2861b886b75a17d7946e0ca5963 (patch) | |
| tree | 07fba049f0454684f402948bb5ca21c896872124 /3rdparty | |
| parent | 0104794101adb7af13e4af09d95af7ee9b2559a2 (diff) | |
Use the system zlib whenever Qt doesn't used it's own version
Newer Qt versions doesn't have the system-zlib CONFIG line anymore.
Instead of relying on that, the check is now switched and we check for
the zlib CONFIG option to be set.
Change-Id: Ic4f290f4b3660bf012b85288f49b53bd965788b1
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/libz.pri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/libz.pri b/3rdparty/libz.pri index 63e566f7..f0c58e06 100644 --- a/3rdparty/libz.pri +++ b/3rdparty/libz.pri @@ -1,8 +1,5 @@ # 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 { +contains(QT_CONFIG, zlib) { CONFIG *= qt QT *= core @@ -11,4 +8,7 @@ contains(QT_CONFIG, system-zlib) { INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib else: \ INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib +} else { + unix|mingw: LIBS_PRIVATE += -lz + else: LIBS += zdll.lib } |